Merge pull request #1254 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit '6db58cfccf4427a92c1473d19b8188cea5f17c3a':
  REPORT-4580 部分视觉验收bug=>16（按钮右对齐）
  REPORT-4580 部分视觉验收bug=>15 边框颜色调整

designer_base/src/com/fr/design/condition/LiteConditionPane.java

@@ -69,6 +69,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
     private static final int DOWN_PADDING = 4;
     private static final int STRUT_ONE = 35;
     private static final int STRUT_TWO = 4;
+    private static final int ADD_CONTROL_PANE_PADDING_RIGHT = -5;
 
     private ActionListener actionListener1 = new ActionListener() {
 
@@ -537,8 +538,14 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
 
     private void initControlPane(JPanel controlPane) {
         JPanel addControlPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        controlPane.add(addControlPane, BorderLayout.SOUTH);
+        addControlPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, ADD_CONTROL_PANE_PADDING_RIGHT));
-        addControlPane.setBorder(new ModLineBorder(ModLineBorder.TOP));
+        JPanel splitPane = new JPanel();
+        splitPane.setBorder(new ModLineBorder(ModLineBorder.TOP));
+
+        JPanel addControlPaneWrapper = new JPanel(new BorderLayout());
+        addControlPaneWrapper.add(addControlPane, BorderLayout.CENTER);
+        addControlPaneWrapper.add(splitPane, BorderLayout.NORTH);
+        controlPane.add(addControlPaneWrapper, BorderLayout.SOUTH);
 
         ButtonGroup bg = new ButtonGroup();
         bg.add(andRadioButton);

designer_base/src/com/fr/design/constants/UIConstants.java

@@ -106,7 +106,7 @@ public interface UIConstants {
     public static final Color RULER_SCALE_COLOR = new Color(0x4e504f);
     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 TITLED_BORDER_COLOR = new Color(0xe8e8e9);
     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 Color TAB_BUTTON_HOVER = new Color(231, 230, 235);

designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java

@@ -172,7 +172,7 @@ public abstract class GUICoreUtils{
 	public static TitledBorder createTitledBorder(String s, Color c) {
 		UITitledBorder tb = UITitledBorder.createBorderWithTitle(s);
 		if (c == null) {
-			c = new Color(102, 153, 255);
+			c = Color.black;
 		}
 		tb.setTitleColor(c);
 		return tb;
@@ -185,7 +185,7 @@ public abstract class GUICoreUtils{
 	 * @return 同上
 	 */
 	public static TitledBorder createTitledBorder(String s) {
-		return createTitledBorder(s, new Color(102, 153, 255));
+		return createTitledBorder(s, Color.black);
 	}
 
 	/**

designer_base/src/com/fr/design/web/CustomIconPane.java

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.Icon;
 import com.fr.base.IconManager;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
@@ -16,6 +17,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.ui.WidgetManager;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
@@ -63,7 +65,7 @@ public class CustomIconPane extends BasicPane {
 	private void initComponents() {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
 		JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		centerPane.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("FR-Designer_Icon")));
+		centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Icon")));
 		JPanel noNamePane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
 		centerPane.add(noNamePane, BorderLayout.CENTER);