From 764fc3b455e41cf76454526a62dc7fdd7dbec42c Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Mon, 13 Nov 2017 16:07:30 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-5284=20=E5=85=AC=E6=B5=8B=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=8F=8D=E9=A6=88=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=85=8D?=
 =?UTF-8?q?=E8=89=B2=E5=92=8C=E4=BA=A4=E4=BA=92=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=3D>=E5=BE=AE=E8=B0=83=E5=BC=B9=E7=AA=97=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/constants/UIConstants.java          | 1 +
 .../src/com/fr/design/gui/controlpane/UIControlPane.java  | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java
index 3df47f30a4..7444f9f8ba 100644
--- a/designer_base/src/com/fr/design/constants/UIConstants.java
+++ b/designer_base/src/com/fr/design/constants/UIConstants.java
@@ -98,6 +98,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