Browse Source

CHART-9435 修改仪表盘默认属性

feature/big-screen
Qinghui.Liu 4 years ago
parent
commit
c2fa176e0a
  1. 9
      designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java
  2. 3
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java

9
designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java

@ -6,10 +6,19 @@ import com.fr.design.style.color.ColorControlWindow;
import com.fr.design.style.color.ColorControlWindowWithAuto;
import com.fr.general.ComparatorUtils;
import javax.swing.Icon;
import java.awt.Color;
public class UIColorButtonWithAuto extends UIColorButton {
public UIColorButtonWithAuto() {
super();
}
public UIColorButtonWithAuto(Icon autoFontIcon) {
super(autoFontIcon);
}
protected void checkColorChange(Color oldColor, Color newColor) {
if (ComparatorUtils.equals(oldColor, ChartConstants.AUTO_FONT_COLOR) && !ComparatorUtils.equals(newColor, ChartConstants.AUTO_FONT_COLOR)) {
setIcon(UIConstants.FONT_ICON);

3
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java

@ -1,6 +1,7 @@
package com.fr.design.mainframe.chart.gui.style;
import com.fr.chart.base.ChartConstants;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.ibutton.UIColorButton;
import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
import com.fr.design.i18n.Toolkit;
@ -35,7 +36,7 @@ public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane {
}
protected void initFontColorState() {
setFontColor(isColorAuto ? new UIColorButtonWithAuto() : new UIColorButton());
setFontColor(isColorAuto ? new UIColorButtonWithAuto(UIConstants.AUTO_FONT_ICON) : new UIColorButton(UIConstants.FONT_ICON));
}
protected Object[] getFontSizeComboBoxModel() {

Loading…
Cancel
Save