Browse Source

DEC-5580 【10.0.2迭代验收】【全局水印】设计器字号可选范围与平台不统一

research/10.0
plough 6 years ago
parent
commit
5e570cbbf1
  1. 7
      designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

7
designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

@ -29,6 +29,11 @@ import java.awt.event.ItemListener;
* Created by plough on 2018/5/15. * Created by plough on 2018/5/15.
*/ */
public class WatermarkPane extends BasicPane { public class WatermarkPane extends BasicPane {
private static final Integer[] FONT_SIZES = {
6, 8, 9, 10, 11, 12, 13, 14, 16,
18, 20, 22, 24, 26, 28, 30, 32, 34,
36, 38, 40, 48, 64, 72, 128
};
private static final int MAX_WIDTH = 160; private static final int MAX_WIDTH = 160;
@ -97,7 +102,7 @@ public class WatermarkPane extends BasicPane {
protected UIScrollPane initRightPane(){ protected UIScrollPane initRightPane(){
formulaPane = new TinyFormulaPane(); formulaPane = new TinyFormulaPane();
fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES); fontSizeComboBox = new UIComboBox(FONT_SIZES);
JPanel fontSizeTypePane = new JPanel(new BorderLayout(10,0)); JPanel fontSizeTypePane = new JPanel(new BorderLayout(10,0));
fontSizeTypePane.add(fontSizeComboBox, BorderLayout.CENTER); fontSizeTypePane.add(fontSizeComboBox, BorderLayout.CENTER);

Loading…
Cancel
Save