Browse Source

Merge pull request #756 in BA/design from ~MANGO/design:dev to dev

* commit 'ec86d81f94da3118320bce7dc1551505016b8ed2':
  还原修改
  超级链接中,图表链接正常显示。
  还原更改
  修改设置字体字号代码。
  修改设置字体字号代码。
  微调布局,使图表超链可以正常显示。
  微调布局,使图表超链可以正常显示。
  修改图表中字体设置。
master
superman 8 years ago
parent
commit
3c646873a8
  1. 13
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java

13
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java

@ -23,16 +23,19 @@ import com.fr.design.utils.gui.GUICoreUtils;
public class ChartTextAttrPane extends BasicPane { public class ChartTextAttrPane extends BasicPane {
private static final long serialVersionUID = 6731679928019436869L; private static final long serialVersionUID = 6731679928019436869L;
private static final int FONT_START = 6;
private static final int FONT_END = 72;
protected UIComboBox fontNameComboBox; protected UIComboBox fontNameComboBox;
protected UIComboBox fontSizeComboBox; protected UIComboBox fontSizeComboBox;
protected UIToggleButton bold; protected UIToggleButton bold;
protected UIToggleButton italic; protected UIToggleButton italic;
protected UIColorButton fontColor; protected UIColorButton fontColor;
public static Integer[] Font_Sizes = new Integer[FONT_END-FONT_START+1];
public static Integer[] Font_Sizes = {new Integer(6), new Integer(8), new Integer(9), new Integer(10), new Integer(11), new Integer(12), new Integer(14), new Integer(16), static{
new Integer(18), new Integer(20), new Integer(22), new Integer(24), new Integer(26), new Integer(28), new Integer(36), new Integer(48), new Integer(72)}; for(int i = FONT_START; i <= FONT_END; i++){
Font_Sizes [i - FONT_START] = new Integer(i);
}
}
public ChartTextAttrPane() { public ChartTextAttrPane() {
initComponents(); initComponents();
} }

Loading…
Cancel
Save