REPORT-3163 合作开发9.0设计器=>弹窗=》条件属性

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

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

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