From 9da19ba5f9ed592db4cbeb4ca877503e168ebd14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Wed, 29 Dec 2021 16:10:04 +0800
Subject: [PATCH] =?UTF-8?q?CHART-22503=20=E6=A0=87=E9=A2=98=E3=80=81?=
 =?UTF-8?q?=E5=9B=BE=E4=BE=8B=E3=80=81=E8=BD=B4=E6=A0=87=E9=A2=98=E3=80=81?=
 =?UTF-8?q?=E8=BD=B4=E6=A0=87=E7=AD=BE=E3=80=81=E6=95=B0=E6=8D=AE=E8=A1=A8?=
 =?UTF-8?q?=E7=AD=89=E5=AD=97=E7=AC=A6=E9=A2=9C=E8=89=B2=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?-=E5=A4=9A=E4=BD=99=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/theme/edit/chart/ChartFontPane.java   | 7 +++++--
 .../mainframe/theme/edit/chart/ChartLabelStylePane.java    | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java
index 84a615f61f..2b19b232e3 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java
@@ -7,7 +7,6 @@ import com.fr.design.constants.LayoutConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ibutton.UIColorButton;
-import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -57,7 +56,11 @@ public class ChartFontPane extends BasicPane {
         fontSizeComboBox = new UIComboBox(FONT_SIZES);
         bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
         italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
-        fontColor = new UIColorButtonWithAuto();
+        fontColor = getColorButton();
+    }
+
+    protected UIColorButton getColorButton() {
+        return new UIColorButton();
     }
 
     protected void initComponents() {
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartLabelStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartLabelStylePane.java
index 8eb736444f..c94dd6ef22 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartLabelStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartLabelStylePane.java
@@ -2,6 +2,8 @@ package com.fr.design.mainframe.theme.edit.chart;
 
 import com.fr.base.theme.settings.ThemedChartStyle;
 import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 
@@ -25,6 +27,11 @@ public class ChartLabelStylePane extends AbstractChartStylePane {
         autoButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Auto"),
                 Toolkit.i18nText("Fine-Design_Chart_Custom")});
         chartFontPane = new ChartFontPane() {
+            @Override
+            protected UIColorButton getColorButton() {
+                return new UIColorButtonWithAuto();
+            }
+
             public String getUILabelText() {
                 return Toolkit.i18nText("Fine-Design_Chart_Label_Character");
             }