Browse Source

Pull request #7352: CHART-22503 标题、图例、轴标题、数据表等字符颜色控件-多余增加了自动

Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0

* commit '9345fba3e13403590f433e8d239b408b0d0dddda':
  CHART-22503 标题、图例、轴标题、数据表等字符颜色控件-多余增加了自动
bugfix/11.0
fanglei 3 years ago
parent
commit
d6aac6a03d
  1. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java
  2. 10
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java

@ -2,7 +2,6 @@ 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;
@ -75,11 +74,6 @@ 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};

10
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java

@ -1,5 +1,6 @@
package com.fr.van.chart.designer.component;
import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithAuto;
import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithThemeStyle;
@ -33,7 +34,7 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane {
if (isInCondition() || !ChartEditContext.supportTheme()) {
return super.createCommonStylePane();
}
setTextAttrPane(new ChartTextAttrPaneWithThemeStyle());
setTextAttrPane(new LabelAttrPaneWithThemeStyle());
JPanel stylePanel = new JPanel(new BorderLayout());
stylePanel.add(getTextAttrPane(), BorderLayout.CENTER);
@ -66,4 +67,11 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane {
}
}
}
class LabelAttrPaneWithThemeStyle extends ChartTextAttrPaneWithThemeStyle {
@Override
protected void initFontColorState() {
setFontColor(new UIColorButtonWithAuto());
}
}
}

Loading…
Cancel
Save