From d998b8524c980e8ebe75a77f9aee9a3be1ac6e03 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Fri, 23 Dec 2016 17:29:38 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1096=20=E5=9C=A8=E2=80=9C=E7=BA=B8?=
 =?UTF-8?q?=E5=BC=A0=E8=83=8C=E6=99=AF=E2=80=9D=E7=AA=97=E5=8F=A3=E4=B8=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=96=E8=89=B2=E5=99=A8=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/ReportBackgroundAction.java        |  7 ++++--
 .../fr/design/style/color/ColorPicker.java    |  1 +
 .../design/style/color/ColorSelectPane.java   | 23 +++++++++++++------
 .../style/color/NewColorSelectPane.java       |  2 +-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/designer/src/com/fr/design/actions/report/ReportBackgroundAction.java b/designer/src/com/fr/design/actions/report/ReportBackgroundAction.java
index 6e8fd84f01..3c3940ddad 100644
--- a/designer/src/com/fr/design/actions/report/ReportBackgroundAction.java
+++ b/designer/src/com/fr/design/actions/report/ReportBackgroundAction.java
@@ -5,6 +5,7 @@ package com.fr.design.actions.report;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.ReportComponentAction;
+import com.fr.design.dialog.BasicDialog;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.ReportComponent;
 import com.fr.design.menu.KeySetUtils;
@@ -36,14 +37,16 @@ public class ReportBackgroundAction extends ReportComponentAction<ReportComponen
         }
         final ReportBackgroundPane bPane = new ReportBackgroundPane();
         bPane.populate(ReportUtils.getReportSettings(reportPane.getTemplateReport()));
-        bPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+        BasicDialog bDialog = bPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
 
             @Override
 			public void doOk() {
                 bPane.update(reportPane.getTemplateReport().getReportSettings());
                 reportPane.fireTargetModified();
             }
-        }).setVisible(true);
+        });
+        bDialog.setModal(false);
+        bDialog.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 4b0fff874e..39fe4445fd 100644
--- a/designer_base/src/com/fr/design/style/color/ColorPicker.java
+++ b/designer_base/src/com/fr/design/style/color/ColorPicker.java
@@ -58,6 +58,7 @@ public class ColorPicker extends JDialog implements ActionListener
         timer = new Timer(1000/FPS, this);
         timer.start();
         hideCursor();
+        System.out.println(KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow());
     }
 
     /**
diff --git a/designer_base/src/com/fr/design/style/color/ColorSelectPane.java b/designer_base/src/com/fr/design/style/color/ColorSelectPane.java
index 7370bfff7f..421c7c8d20 100644
--- a/designer_base/src/com/fr/design/style/color/ColorSelectPane.java
+++ b/designer_base/src/com/fr/design/style/color/ColorSelectPane.java
@@ -3,10 +3,7 @@
  */
 package com.fr.design.style.color;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.GridLayout;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -71,10 +68,22 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
 		// center
 		JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
 		this.add(centerPane, BorderLayout.CENTER);
-		
+
+		// 第一行，1个取色按钮 + 7个最近使用的颜色
+		JPanel row1Pane = new JPanel(FRGUIPaneFactory.createBorderLayout());
+		row1Pane.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 0));
+		row1Pane.setPreferredSize(new Dimension(135, 24));  // 宽度为 16 * 8 + 7
+		centerPane.add(row1Pane);
+
+		// 取色按钮
+		PickColorButton pickColorButton = new PickColorButton(this, PickColorButton.IconType.ICON16, true);
+
+		row1Pane.add(pickColorButton, BorderLayout.WEST);
+
 		// 最近使用
-		UsedColorPane pane = new UsedColorPane(1, 8, ColorSelectConfigManager.getInstance().getColors(),this);
-		centerPane.add(pane.getPane());
+		UsedColorPane usedColorPane = new UsedColorPane(1, 7, ColorSelectConfigManager.getInstance().getColors(),this);
+		usedColorPane.getPane().setBorder(BorderFactory.createEmptyBorder(0, 1, 0, 8));
+		row1Pane.add(usedColorPane.getPane());
 		
 		JPanel menuColorPane1 = new JPanel();
 		centerPane.add(menuColorPane1);
diff --git a/designer_base/src/com/fr/design/style/color/NewColorSelectPane.java b/designer_base/src/com/fr/design/style/color/NewColorSelectPane.java
index 4416717868..0a41ce5391 100644
--- a/designer_base/src/com/fr/design/style/color/NewColorSelectPane.java
+++ b/designer_base/src/com/fr/design/style/color/NewColorSelectPane.java
@@ -87,7 +87,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 		centerPane.add(row1Pane);
 
 		// 取色按钮
-		PickColorButton pickColorButton = new PickColorButton(this, PickColorButton.IconType.ICON18);
+		PickColorButton pickColorButton = new PickColorButton(this, PickColorButton.IconType.ICON16);
 
 		row1Pane.add(pickColorButton, BorderLayout.WEST);