From 8119f1fbdffc3f1f343ed6165e09adc24f1e857d Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Mon, 3 Dec 2018 10:16:18 +0800
Subject: [PATCH] =?UTF-8?q?DEC-5624=20=E3=80=9010.0.2=E8=BF=AD=E4=BB=A3?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=E3=80=91=E3=80=90=E5=85=A8=E5=B1=80=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E4=B8=AD=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E9=85=8D=E7=BD=AE=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/report/WatermarkPane.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java b/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
index 9b9ff0950..95e791e0f 100644
--- a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
+++ b/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.setFontSize((int)fontSizeComboBox.getSelectedItem());
         watermark.setColor(colorPane.getColor());
+        colorPane.updateUsedColor();
         return watermark;
     }
 
@@ -156,7 +157,8 @@ public class WatermarkPane extends BasicPane {
     }
 
     private void populateColor(Color color) {
-        colorPane.setColor(color);
+        // 颜色面板的色值只有 rgb，去掉 alpha 通道
+        colorPane.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue()));
         colorPane.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {