From 81543e850b5ced448895f2d2cea94b3ee502da35 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 18 Sep 2017 12:04:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-4580=20=E9=83=A8=E5=88=86=E8=A7=86?= =?UTF-8?q?=E8=A7=89=E9=AA=8C=E6=94=B6bug=3D>15=20=E8=BE=B9=E6=A1=86?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/constants/UIConstants.java | 2 +- designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java | 4 ++-- designer_base/src/com/fr/design/web/CustomIconPane.java | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java index 4d5a5cea5..498bc3632 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/designer_base/src/com/fr/design/constants/UIConstants.java @@ -106,7 +106,7 @@ public interface UIConstants { public static final Color RULER_SCALE_COLOR = new Color(0x4e504f); public static final Color PROPERTY_PANE_BACKGROUND = new Color(0xdadadd); public static final Color SPLIT_LINE = new Color(201, 198, 184); - public static final Color TITLED_BORDER_COLOR = new Color(0xededee); + public static final Color TITLED_BORDER_COLOR = new Color(0xe8e8e9); public static final Color POP_DIALOG_BORDER = new Color(218, 218, 221); public static final Color PROPERTY_DIALOG_BORDER = new Color(0xc9c9cd); public static final Color TAB_BUTTON_HOVER = new Color(231, 230, 235); diff --git a/designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java b/designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java index 8c6252b63..b68418cc3 100644 --- a/designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java +++ b/designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java @@ -172,7 +172,7 @@ public abstract class GUICoreUtils{ public static TitledBorder createTitledBorder(String s, Color c) { UITitledBorder tb = UITitledBorder.createBorderWithTitle(s); if (c == null) { - c = new Color(102, 153, 255); + c = Color.black; } tb.setTitleColor(c); return tb; @@ -185,7 +185,7 @@ public abstract class GUICoreUtils{ * @return 同上 */ public static TitledBorder createTitledBorder(String s) { - return createTitledBorder(s, new Color(102, 153, 255)); + return createTitledBorder(s, Color.black); } /** diff --git a/designer_base/src/com/fr/design/web/CustomIconPane.java b/designer_base/src/com/fr/design/web/CustomIconPane.java index b075aad43..925fb3e34 100644 --- a/designer_base/src/com/fr/design/web/CustomIconPane.java +++ b/designer_base/src/com/fr/design/web/CustomIconPane.java @@ -4,6 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.base.GraphHelper; import com.fr.base.Icon; import com.fr.base.IconManager; +import com.fr.design.constants.UIConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.ibutton.UIButton; @@ -16,6 +17,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.form.ui.WidgetManager; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; @@ -63,7 +65,7 @@ public class CustomIconPane extends BasicPane { private void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("FR-Designer_Icon"))); + centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Icon"))); JPanel noNamePane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); centerPane.add(noNamePane, BorderLayout.CENTER); From 973b2017f430b1b3bd3a90cd9a2556a4224dd49a Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 18 Sep 2017 16:55:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-4580=20=E9=83=A8=E5=88=86=E8=A7=86?= =?UTF-8?q?=E8=A7=89=E9=AA=8C=E6=94=B6bug=3D>16=EF=BC=88=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=8F=B3=E5=AF=B9=E9=BD=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/condition/LiteConditionPane.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/condition/LiteConditionPane.java b/designer_base/src/com/fr/design/condition/LiteConditionPane.java index 815699a76..ab1757153 100644 --- a/designer_base/src/com/fr/design/condition/LiteConditionPane.java +++ b/designer_base/src/com/fr/design/condition/LiteConditionPane.java @@ -69,6 +69,7 @@ public abstract class LiteConditionPane extends BasicBeanPa private static final int DOWN_PADDING = 4; private static final int STRUT_ONE = 35; private static final int STRUT_TWO = 4; + private static final int ADD_CONTROL_PANE_PADDING_RIGHT = -5; private ActionListener actionListener1 = new ActionListener() { @@ -537,8 +538,14 @@ public abstract class LiteConditionPane extends BasicBeanPa private void initControlPane(JPanel controlPane) { JPanel addControlPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - controlPane.add(addControlPane, BorderLayout.SOUTH); - addControlPane.setBorder(new ModLineBorder(ModLineBorder.TOP)); + addControlPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, ADD_CONTROL_PANE_PADDING_RIGHT)); + JPanel splitPane = new JPanel(); + splitPane.setBorder(new ModLineBorder(ModLineBorder.TOP)); + + JPanel addControlPaneWrapper = new JPanel(new BorderLayout()); + addControlPaneWrapper.add(addControlPane, BorderLayout.CENTER); + addControlPaneWrapper.add(splitPane, BorderLayout.NORTH); + controlPane.add(addControlPaneWrapper, BorderLayout.SOUTH); ButtonGroup bg = new ButtonGroup(); bg.add(andRadioButton);