From 854ad41fd029dd07ecad84f746bd6ddddb625fc9 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Wed, 29 Nov 2017 11:17:35 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-5508=20=E5=8A=A0=E5=9B=9E=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/cell/settingpane/style/CustomStylePane.java      | 3 +++
 .../src/com/fr/design/gui/ibutton/UIToggleButton.java          | 1 +
 2 files changed, 4 insertions(+)

diff --git a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
index 06b8cb937b..0f6d385205 100644
--- a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
+++ b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
@@ -4,6 +4,7 @@ import com.fr.base.CellBorderStyle;
 import com.fr.base.NameStyle;
 import com.fr.base.Style;
 import com.fr.design.actions.utils.ReportActionUtils;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.MultiTabPane;
 import com.fr.design.gui.style.*;
@@ -12,6 +13,7 @@ import com.fr.design.style.BorderUtils;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
 
+import javax.swing.*;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
 import java.util.ArrayList;
@@ -38,6 +40,7 @@ public class CustomStylePane extends MultiTabPane<Style> {
         super();
         tabPane.setOneLineTab(true);
         tabPane.setDrawLine(false);
+        tabPane.setBorder(BorderFactory.createLineBorder(UIConstants.SHADOW_GREY));
         tabPane.setLayout(new GridLayout(1, 3, 0, 0));
     }
 
diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java b/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java
index b47975b3f0..a3a9d066f7 100644
--- a/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java
+++ b/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java
@@ -74,6 +74,7 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{
 	 */
 	public UIToggleButton(Icon[] icons, boolean needRelease) {
 		super(icons[0], null, icons[1]);
+		setBorderPainted(true);
 		setSelectedIcon(icons[1]);
 		setExtraPainted(true);
 		if (!needRelease) {