Browse Source

DEC-5624 【10.0.2迭代验收】【全局水印】设计器中颜色配置不显示

research/10.0
plough 6 years ago
parent
commit
8119f1fbdf
  1. 4
      designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

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

@ -83,6 +83,7 @@ public class WatermarkPane extends BasicPane {
watermark.setText(formulaPane.getUITextField().getText()); watermark.setText(formulaPane.getUITextField().getText());
watermark.setFontSize((int)fontSizeComboBox.getSelectedItem()); watermark.setFontSize((int)fontSizeComboBox.getSelectedItem());
watermark.setColor(colorPane.getColor()); watermark.setColor(colorPane.getColor());
colorPane.updateUsedColor();
return watermark; return watermark;
} }
@ -156,7 +157,8 @@ public class WatermarkPane extends BasicPane {
} }
private void populateColor(Color color) { private void populateColor(Color color) {
colorPane.setColor(color); // 颜色面板的色值只有 rgb,去掉 alpha 通道
colorPane.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue()));
colorPane.addChangeListener(new ChangeListener() { colorPane.addChangeListener(new ChangeListener() {
@Override @Override
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {

Loading…
Cancel
Save