diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java index c9ad2c6eb7..21d7bcf3a6 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/designer_base/src/com/fr/design/constants/UIConstants.java @@ -109,6 +109,7 @@ public interface UIConstants { public static final Color ATTRIBUTE_NORMAL = Color.WHITE; public static final Color ATTRIBUTE_HOVER = new Color(0xF5F5F7); public static final Color UI_TOOLBAR_COLOR = new Color(0xF5F5F7); + public static final Color DIALOG_TITLEBAR_BACKGROUND = new Color(0xFCFCFD); public static final Color CHECKBOX_HOVER_SELECTED = new Color(0x3394f0); public static final Color TEXT_FILED_BORDER_SELECTED = new Color(0x3384f0); public static final Color SHEET_NORMAL = new Color(0xc8c8ca); diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java index d1673d47aa..66ce1865cf 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java @@ -443,14 +443,16 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH public PopupToolPane(String title, JDialog parentDialog) { super(); this.parentDialog = parentDialog; - originColor = UIConstants.UI_TOOLBAR_COLOR; + originColor = UIConstants.DIALOG_TITLEBAR_BACKGROUND; contentPane = new JPanel(); contentPane.setBackground(originColor); contentPane.setLayout(new BorderLayout()); titleLabel = new UILabel(title); + Font font = new Font("SimSun", Font.PLAIN, 12); + titleLabel.setFont(font); contentPane.add(titleLabel, BorderLayout.WEST); - contentPane.setBorder(new EmptyBorder(5, 10, 5, 0)); + contentPane.setBorder(new EmptyBorder(5, 14, 6, 0)); setLayout(new BorderLayout()); add(contentPane, BorderLayout.CENTER); @@ -466,7 +468,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH @Override public Dimension getPreferredSize() { - return new Dimension(super.getPreferredSize().width, 25); + return new Dimension(super.getPreferredSize().width, 28); } } } \ No newline at end of file