From f79a6d43b48cc079ce9165b36387fbb292d995f7 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Wed, 6 Sep 2017 16:49:48 +0800
Subject: [PATCH] =?UTF-8?q?UIButtonGroup=EF=BC=8CCustomStylePane=20border?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settingpane/style/CustomStylePane.java    |  3 +-
 .../fr/design/gui/ibutton/UIButtonGroup.java  | 28 -------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

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 691221bda0..eab7593332 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
@@ -6,7 +6,6 @@ import com.fr.base.Style;
 import com.fr.design.actions.utils.ReportActionUtils;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.MultiTabPane;
-import com.fr.design.gui.ibutton.FiveButtonLayout;
 import com.fr.design.gui.style.*;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.style.BorderUtils;
@@ -39,7 +38,7 @@ public class CustomStylePane extends MultiTabPane<Style> {
         super();
         tabPane.setOneLineTab(true);
         tabPane.setDrawLine(false);
-        tabPane.setLayout(new FiveButtonLayout(1));
+        tabPane.setLayout(new GridLayout(1, 3, 0, 0));
     }
 
     public static void main(String[] args) {
diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java b/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
index ddd9d4494a..28bc8ede7b 100644
--- a/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
+++ b/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
@@ -179,34 +179,6 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
         g2d.setClip(oldClip);
     }
 
-    /**
-     * 重载Border画法
-     *
-     * @param g
-     */
-    @Override
-    protected void paintBorder(Graphics g) {
-        if (isToolBarComponent) {
-            return;
-        }
-        Graphics2D g2d = (Graphics2D) g;
-        g2d.setColor(UIConstants.SHADOW_GREY);
-
-        int width = 0;
-        for (int i = 0; i < labelButtonList.size() - 1; i++) {
-            width += labelButtonList.get(i).getWidth() + 1;
-            int height = labelButtonList.get(i).getHeight();
-            g.drawLine(width, 0, width, height);
-        }
-
-        width += labelButtonList.get(labelButtonList.size() - 1).getWidth() + 1;
-
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g2d.drawRoundRect(0, 0, width, getHeight() - 1, UIConstants.BUTTON_GROUP_ARC, UIConstants.BUTTON_GROUP_ARC);
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
-
-    }
-
     /**
      * setSelectedItem
      *