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();