From f2ba828f5fdde39e607cb8e84636c8233c65f208 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Fri, 30 Dec 2016 10:39:06 +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=E6=94=B9=E4=B8=BA=E5=8F=AA=E5=9C=A8=E6=8C=89=E4=B8=8B?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=E5=B7=A6=E9=94=AE=E6=97=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2?=
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, 9 insertions(+), 3 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 cb30c186dd..8503c7f1ee 100644
--- a/designer_base/src/com/fr/design/style/color/ColorPicker.java
+++ b/designer_base/src/com/fr/design/style/color/ColorPicker.java
@@ -94,9 +94,11 @@ public class ColorPicker extends JDialog implements ActionListener
         validate();    // 更新所有子控件
     }
 
-    public void pickComplete() {
+    public void pickComplete(Boolean setColor) {
         timer.stop();
-        colorSelectable.setColor(colorToSet);
+        if (setColor) {
+            colorSelectable.setColor(colorToSet);
+        }
         this.dispose();
     }
 
@@ -111,7 +113,11 @@ public class ColorPicker extends JDialog implements ActionListener
     {
         public void mousePressed(MouseEvent e)
         {
-            pickComplete();
+            if (e.getButton() == e.BUTTON1) {  // 左键确定
+                pickComplete(true);
+            } else {
+                pickComplete(false);
+            }
         }
     }
 }