From fa3b8b84eee7e78672fc57e52f87d8f8d4c0c047 Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 22 Jan 2018 17:05:25 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-6709=20=E6=8A=A5=E8=A1=A8=E5=9D=97?= =?UTF-8?q?=E3=80=81=E5=9B=BE=E8=A1=A8=E5=9D=97=E7=9A=84=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=80=89=E4=BA=86=E8=87=AA=E5=AE=9A=E4=B9=89=EF=BC=8C=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E4=B8=8B=E6=96=B9=E6=B2=A1=E6=9C=89=E8=81=94=E5=8A=A8?= =?UTF-8?q?=E5=87=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/xpane/CardTagLayoutBorderPreviewPane.java | 5 +++++ .../src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPreviewPane.java b/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPreviewPane.java index 9030ce0aa1..9e9e179128 100644 --- a/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPreviewPane.java +++ b/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPreviewPane.java @@ -11,4 +11,9 @@ public class CardTagLayoutBorderPreviewPane extends LayoutBorderPreviewPane{ public CardTagLayoutBorderPreviewPane(LayoutBorderStyle borderStyle) { super(borderStyle,true); } + + @Override + protected void showTitlePreviewPane(){ + return; + } } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java index 5aa65360a6..8134042fde 100644 --- a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java +++ b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java @@ -92,9 +92,14 @@ public class LayoutBorderPreviewPane extends JPanel{ jp.setBounds(smallGAP,smallGAP, getWidth() - GAP, height); borderStyle.paint(g, new Rectangle2D.Double(smallGAP, smallGAP, getWidth() - GAP, getHeight() - GAP)); jp.setFontObject(borderStyle.getTitle().getFrFont()); + showTitlePreviewPane(); } } + protected void showTitlePreviewPane(){ + jp.setVisible(borderStyle.getType() == LayoutBorderStyle.TITLE); + } + private class titlePreviewPane extends UITextArea { private FRFont frFont = null;