From 844e1790406f2af2028b8f7d33cd8e60dc2f65d6 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Wed, 13 Oct 2021 17:07:45 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-60812=20=E3=80=90=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E3=80=91=E4=B8=BB=E9=A2=98=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E7=9A=84=E6=A1=86=E6=A1=86=E6=98=BE=E7=A4=BA=E6=9C=89=E7=82=B9?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
调整设计器Tab组件边框颜色

【改动思路】
同上
---
 .../fr/design/gui/frpane/UITabbedPane.java    | 12 +++++++++++
 .../fr/design/gui/frpane/UITabbedPaneUI.java  | 21 ++++++++++++++-----
 .../theme/TemplateThemeGridPagesPane.java     |  1 +
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java
index c1021321b..fd2fcc375 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java
@@ -21,6 +21,8 @@ public class UITabbedPane extends JTabbedPane{
     private String classPath;  //panel对象的类名
     private String tabName;  //Tab名称
     private  int tabSize = 0;
+    private Color tabBorderColor;
+
     public UITabbedPane() {
         super();
     }
@@ -93,6 +95,16 @@ public class UITabbedPane extends JTabbedPane{
     public int getTabSize(){
         return tabSize;
     }
+
+    public Color getTabBorderColor() {
+        return tabBorderColor;
+    }
+
+    public void setTabBorderColor(Color tabBorderColor) {
+        this.tabBorderColor = tabBorderColor;
+        repaint();
+    }
+
     @Override
     /**
      * 获取UI对象
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java
index 5798a864b..d31107c2c 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java
@@ -31,9 +31,20 @@ public class UITabbedPaneUI extends BasicTabbedPaneUI {
     private int addX = -1;
     private int addY = -1;
     private int rollover = -1;
-    private Color tabBorderColor = new Color(143, 160, 183);
+    private final Color DEFAULT_TAB_BORDER_COLOR = new Color(143, 160, 183);
     private Color[] tabSelectedColor = {UIConstants.NORMAL_BLUE, UIConstants.NORMAL_BLUE, UIConstants.NORMAL_BLUE};
 
+    public Color getTabBorderColor() {
+        Color color = null;
+        if (tabPane instanceof UITabbedPane) {
+            color = ((UITabbedPane) tabPane).getTabBorderColor();
+        }
+        if (color == null) {
+            color = DEFAULT_TAB_BORDER_COLOR;
+        }
+        return color;
+    }
+
     /**
      * 创建UI对象
      *
@@ -252,9 +263,9 @@ public class UITabbedPaneUI extends BasicTabbedPaneUI {
     private void drawUITabBorder(Graphics g, int tabPlacement, int x, int y, int w, int h,
                                  boolean isSelected, boolean isEnabled, boolean isRollover) {
         if (!isEnabled) {
-            drawUITabBorder(g, tabBorderColor, x, y, w, h, tabPlacement);
+            drawUITabBorder(g, getTabBorderColor(), x, y, w, h, tabPlacement);
         } else if (isSelected || isRollover) {
-            drawSelectedUITabBorder(g, tabBorderColor, x, y, w, h, tabPlacement);
+            drawSelectedUITabBorder(g, getTabBorderColor(), x, y, w, h, tabPlacement);
             if (isRollover && canClose()) {
                 closeX = x + w - closeIcon.getIconWidth() - 3;
                 closeY = 0;
@@ -269,7 +280,7 @@ public class UITabbedPaneUI extends BasicTabbedPaneUI {
                 closeIcon.paintIcon(tabPane, g, closeX, closeY);
             }
         } else {
-            drawUITabBorder(g, tabBorderColor, x, y, w, h, tabPlacement);
+            drawUITabBorder(g, getTabBorderColor(), x, y, w, h, tabPlacement);
         }
     }
 
@@ -322,7 +333,7 @@ public class UITabbedPaneUI extends BasicTabbedPaneUI {
     }
 
     private void drawUIContentBorder(Graphics g, int x, int y, int w, int h) {
-        g.setColor(tabBorderColor);
+        g.setColor(getTabBorderColor());
         g.drawRect(x, y, w - 3, h - 3);
         // Shadow
         g.setColor(new Color(204, 204, 204));
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPagesPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPagesPane.java
index fa8207696..40838dbd8 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPagesPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPagesPane.java
@@ -293,6 +293,7 @@ public class TemplateThemeGridPagesPane extends JPanel {
             setLayout(FRGUIPaneFactory.createBorderLayout());
 
             tabbedPane = new UITabbedPane();
+            tabbedPane.setTabBorderColor(new Color(0xE0E0E1));
             add(tabbedPane, BorderLayout.CENTER);
 
             formThemesManagerPane = TemplateThemeGridControlPane.createFormThemesManagerPane();