From e511e0582a4c89669a9342f43263bdf2c9ed1e49 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 8 Aug 2017 21:06:01 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=3D=E3=80=8B=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/designer_base/src/com/fr/design/border/UITitledBorder.java b/designer_base/src/com/fr/design/border/UITitledBorder.java
index 6f8fcfea9d..48eebbd951 100644
--- a/designer_base/src/com/fr/design/border/UITitledBorder.java
+++ b/designer_base/src/com/fr/design/border/UITitledBorder.java
@@ -1,5 +1,7 @@
 package com.fr.design.border;
 
+import com.fr.design.constants.UIConstants;
+
 import java.awt.Color;
 
 import javax.swing.BorderFactory;
@@ -19,7 +21,7 @@ public class UITitledBorder extends TitledBorder {
 	}
 	
 	private void init(String title){
-		UIRoundedBorder roundedborder = new UIRoundedBorder(new Color(204, 204, 204), 1, 10);
+		UIRoundedBorder roundedborder = new UIRoundedBorder(UIConstants.TITLED_BORDER_COLOR, 1, 10);
 		this.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0), roundedborder));
 		
 		this.setTitle(title);
diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java
index c39ee54c4f..916e8e71bc 100644
--- a/designer_base/src/com/fr/design/constants/UIConstants.java
+++ b/designer_base/src/com/fr/design/constants/UIConstants.java
@@ -101,6 +101,7 @@ public interface UIConstants {
     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 POP_DIALOG_BORDER = new Color(218, 218, 221);
 
 
     public static final BufferedImage DRAG_BAR = BaseUtils.readImage("com/fr/design/images/control/bar.png");
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 34d7d08222..dd94f0d96d 100644
--- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java
+++ b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.gui.controlpane;
 
+import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itoolbar.UIToolBarUI;
@@ -276,7 +277,10 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
             setUndecorated(true);
             pane.setBorder(BorderFactory.createEmptyBorder(20, 10, 10, 10));
             this.editPane = pane;
-            this.getContentPane().add(editPane, BorderLayout.CENTER);
+            JPanel editPaneWrapper = new JPanel(new BorderLayout());
+            editPaneWrapper.add(editPane, BorderLayout.CENTER);
+            editPaneWrapper.setBorder(BorderFactory.createLineBorder(UIConstants.POP_DIALOG_BORDER, 1));
+            this.getContentPane().add(editPaneWrapper, BorderLayout.CENTER);
             setSize(WIDTH, HEIGHT);
 //            pack();
             this.setVisible(false);