From 4619bec0de9ea0c1c44acd85f3d94520b4377629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Thu, 2 Dec 2021 15:06:55 +0800
Subject: [PATCH] =?UTF-8?q?CHART-22039=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/theme/edit/chart/ChartFontPane.java | 3 ++-
 .../chart/gui/style/ChartTextAttrPaneWithThemeStyle.java    | 6 ++++++
 .../pie/style/VanChartPieCategoryLabelContentPane.java      | 5 +++--
 3 files changed, 11 insertions(+), 3 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 ee04556c6..84a615f61 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,6 +7,7 @@ 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;
@@ -56,7 +57,7 @@ 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 UIColorButton();
+        fontColor = new UIColorButtonWithAuto();
     }
 
     protected void initComponents() {
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java
index 345d57de8..a29134736 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java
@@ -2,6 +2,7 @@ package com.fr.design.mainframe.chart.gui.style;
 
 import com.fr.chart.base.TextAttr;
 import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
@@ -74,6 +75,11 @@ public class ChartTextAttrPaneWithThemeStyle extends ChartTextAttrPane {
         textFontPane.setVisible(preButton.getSelectedIndex() == CUSTOM);
     }
 
+    @Override
+    protected void initFontColorState() {
+        setFontColor(new UIColorButtonWithAuto());
+    }
+
     protected double[] getRowSize() {
         double p = TableLayout.PREFERRED;
         return new double[]{p, p};
diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryLabelContentPane.java
index 73c63bbee..5039f5388 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryLabelContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryLabelContentPane.java
@@ -1,13 +1,14 @@
 package com.fr.van.chart.pie.style;
 
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
+import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithAuto;
 import com.fr.design.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.format.AttrTooltipCategoryFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipSummaryValueFormat;
 import com.fr.plugin.chart.pie.attr.PieCategoryLabelContent;
+import com.fr.plugin.chart.type.FontAutoType;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.component.format.SummaryValueFormatPaneWithCheckBox;
@@ -86,7 +87,7 @@ public class VanChartPieCategoryLabelContentPane extends VanChartLabelContentPan
     }
 
     public JPanel createCommonStylePane() {
-        setTextAttrPane(new ChartTextAttrPane());
+        setTextAttrPane(new ChartTextAttrPaneWithAuto(FontAutoType.COLOR));
         return getTextAttrPane();
     }