From e596f2aca760cd2f7c700c00d603c7861aaa8571 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 3 Jan 2017 19:43:51 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1096=20=E5=8F=96=E8=89=B2=E6=9D=BF=3D?=
 =?UTF-8?q?=E3=80=8B=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/style/color/ColorPicker.java   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/designer_base/src/com/fr/design/style/color/ColorPicker.java b/designer_base/src/com/fr/design/style/color/ColorPicker.java
index c103e84371..e616e08af7 100644
--- a/designer_base/src/com/fr/design/style/color/ColorPicker.java
+++ b/designer_base/src/com/fr/design/style/color/ColorPicker.java
@@ -112,12 +112,10 @@ public class ColorPicker extends JDialog implements ActionListener
         validate();    // 更新所有子控件
     }
 
-    public void pickComplete(Boolean setColor) {
+    public void pickComplete(Color color) {
         timer.stop();
-        if (setColor) {
-            colorSelectable.setColor(colorToSet);
-        } else if (setColorRealTime) {
-            colorSelectable.setColor(initColor);
+        if (color != null) {
+            colorSelectable.setColor(color);
         }
         this.dispose();
     }
@@ -134,9 +132,9 @@ public class ColorPicker extends JDialog implements ActionListener
         public void mousePressed(MouseEvent e)
         {
             if (e.getButton() == e.BUTTON1) {  // 左键确定
-                pickComplete(true);
+                pickComplete(colorToSet);
             } else {
-                pickComplete(false);
+                pickComplete(setColorRealTime ? initColor : null);
             }
         }
     }