From f40e85f646442dbf3cfe8a017477e6849fdc0c5b Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 22 Aug 2017 09:28:18 +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>=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E5=B1=9E=E6=80=A7=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E5=BC=B9=E5=87=BA=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E5=8A=A0=E8=BE=B9=E6=A1=86=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/constants/UIConstants.java         | 1 +
 .../com/fr/design/mainframe/EastRegionContainerPane.java | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java
index a96e64c3c..758b3bf79 100644
--- a/designer_base/src/com/fr/design/constants/UIConstants.java
+++ b/designer_base/src/com/fr/design/constants/UIConstants.java
@@ -104,6 +104,7 @@ public interface UIConstants {
     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 Color PROPERTY_DIALOG_BORDER = new Color(0xc9c9cd);
 
 
     public static final BufferedImage DRAG_BAR = BaseUtils.readImage("com/fr/design/images/control/bar.png");
diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index a45b5db0f..ce4c81b37 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -899,8 +899,13 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             PopupToolPane popupToolPane = new PopupToolPane(propertyItem, PopupToolPane.UP_BUTTON);
             popupToolPane.setParentDialog(this);
             contentPane = propertyItem.getContentPane();
-            container.add(popupToolPane, BorderLayout.NORTH);
-            container.add(contentPane, BorderLayout.CENTER);
+
+            JPanel contentWrapper = new JPanel(new BorderLayout());
+            contentWrapper.add(popupToolPane, BorderLayout.NORTH);
+            contentWrapper.add(contentPane, BorderLayout.CENTER);
+            contentWrapper.setBorder(BorderFactory.createLineBorder(UIConstants.PROPERTY_DIALOG_BORDER));
+
+            container.add(contentWrapper, BorderLayout.CENTER);
             setSize(CONTENT_WIDTH, POPUP_DEFAULT_HEIGHT);
             adjustLocation();