From 81543e850b5ced448895f2d2cea94b3ee502da35 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 18 Sep 2017 12:04:01 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4580=20=E9=83=A8=E5=88=86=E8=A7=86?=
 =?UTF-8?q?=E8=A7=89=E9=AA=8C=E6=94=B6bug=3D>15=20=E8=BE=B9=E6=A1=86?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/constants/UIConstants.java  | 2 +-
 designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java | 4 ++--
 designer_base/src/com/fr/design/web/CustomIconPane.java     | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java
index 4d5a5cea5b..498bc3632a 100644
--- a/designer_base/src/com/fr/design/constants/UIConstants.java
+++ b/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);
diff --git a/designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java b/designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java
index 8c6252b633..b68418cc35 100644
--- a/designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java
+++ b/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);
 	}
 
 	/**
diff --git a/designer_base/src/com/fr/design/web/CustomIconPane.java b/designer_base/src/com/fr/design/web/CustomIconPane.java
index b075aad43d..925fb3e34f 100644
--- a/designer_base/src/com/fr/design/web/CustomIconPane.java
+++ b/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);