From 874d88ca75d993d45b407b99122d94f09d302175 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Fri, 30 Dec 2016 15:23:42 +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=E5=B0=86=E5=8F=96=E8=89=B2=E6=A1=86=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=A8=A1=E6=80=81=E5=AF=B9=E8=AF=9D=E6=A1=86=EF=BC=9B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=BC=A0=E6=A0=87=E4=BA=8B=E4=BB=B6=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/actions/report/ReportBackgroundAction.java  |  6 ++----
 .../src/com/fr/design/style/color/ColorPicker.java     |  3 +++
 .../com/fr/design/style/color/ColorSelectDialog.java   |  2 +-
 .../fr/design/style/color/PickColorButtonFactory.java  | 10 ++++------
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/designer/src/com/fr/design/actions/report/ReportBackgroundAction.java b/designer/src/com/fr/design/actions/report/ReportBackgroundAction.java
index 3c3940ddad..4a381d4d08 100644
--- a/designer/src/com/fr/design/actions/report/ReportBackgroundAction.java
+++ b/designer/src/com/fr/design/actions/report/ReportBackgroundAction.java
@@ -37,16 +37,14 @@ public class ReportBackgroundAction extends ReportComponentAction<ReportComponen
         }
         final ReportBackgroundPane bPane = new ReportBackgroundPane();
         bPane.populate(ReportUtils.getReportSettings(reportPane.getTemplateReport()));
-        BasicDialog bDialog = bPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+        bPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
 
             @Override
 			public void doOk() {
                 bPane.update(reportPane.getTemplateReport().getReportSettings());
                 reportPane.fireTargetModified();
             }
-        });
-        bDialog.setModal(false);
-        bDialog.setVisible(true);
+        }).setVisible(true);
         return false;
     }
 }
\ No newline at end of file
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 8503c7f1ee..605474230b 100644
--- a/designer_base/src/com/fr/design/style/color/ColorPicker.java
+++ b/designer_base/src/com/fr/design/style/color/ColorPicker.java
@@ -49,7 +49,10 @@ public class ColorPicker extends JDialog implements ActionListener
         updateSize(colorPickerSize);
         this.colorSelectable = colorSelectable;
         this.setColorRealTime = setColorRealTime;
+        start();
+        this.setModal(true);
         this.setAlwaysOnTop(true);
+        updateLocation();
         this.setVisible(true);
         this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
     }
diff --git a/designer_base/src/com/fr/design/style/color/ColorSelectDialog.java b/designer_base/src/com/fr/design/style/color/ColorSelectDialog.java
index a26bc10c26..11a243b6cd 100644
--- a/designer_base/src/com/fr/design/style/color/ColorSelectDialog.java
+++ b/designer_base/src/com/fr/design/style/color/ColorSelectDialog.java
@@ -137,7 +137,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
 	public static void showDialog(Frame owner,ColorSelectDetailPane pane,Color initialColor,ColorSelectable selectePane){
 		ColorTracker okListener = new ColorTracker(pane);
 		ColorSelectDialog dialog = new ColorSelectDialog(owner,pane,initialColor,okListener,selectePane);
-//		dialog.setModal(true);
+		dialog.setModal(true);
 		dialog.show();
 	}
 
diff --git a/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java b/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java
index 0ffd293c84..32188ff4e8 100644
--- a/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java
+++ b/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java
@@ -4,8 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.design.gui.ibutton.UIButton;
 
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.awt.event.*;
 
 /**
  * Created by plough on 2016/12/22.
@@ -28,11 +27,10 @@ public class PickColorButtonFactory {
         }
         pickColorButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
 
-        pickColorButton.addActionListener(new ActionListener() {
+        pickColorButton.addMouseListener(new MouseAdapter() {
             @Override
-            public void actionPerformed(ActionEvent e) {
-                ColorPicker colorPicker = new ColorPicker(colorSelectable, setColorRealTime);
-                colorPicker.start();
+            public void mousePressed(MouseEvent e) {
+                new ColorPicker(colorSelectable, setColorRealTime);
             }
         });