From c4e900ef74eca06bf917ff59f23987f1f4225139 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Thu, 26 Mar 2020 16:19:14 +0800
Subject: [PATCH] =?UTF-8?q?CHART-13064=20=E4=BF=AE=E6=94=B9=E5=90=AB?=
 =?UTF-8?q?=E6=9C=89=E8=87=AA=E5=8A=A8button=E7=9A=84=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../style/color/ColorControlWindowWithAuto.java      | 10 ++++++++++
 .../fr/design/style/color/NewColorSelectPane.java    | 12 ++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindowWithAuto.java b/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindowWithAuto.java
index 05da3d4b97..cbb0e97eaa 100644
--- a/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindowWithAuto.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindowWithAuto.java
@@ -16,6 +16,7 @@ import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -46,6 +47,8 @@ public abstract class ColorControlWindowWithAuto extends ColorControlWindow {
     class ColorSelectionPopupPaneWithAuto extends NewColorSelectPane {
         private static final long serialVersionUID = 7822856562329146354L;
 
+        private final static int BUTTON_HEIGHT = 15;
+
         public ColorSelectionPopupPaneWithAuto(boolean isSupportTransparent) {
             super(isSupportTransparent);
 
@@ -111,6 +114,13 @@ public abstract class ColorControlWindowWithAuto extends ColorControlWindow {
             }
         }
 
+        public Dimension getPreferredSize() {
+            if (isSupportTransparent()) {
+                return new Dimension(super.getPreferredSize().width, TRANSPARENT_WINDOW_HEIGHT + BUTTON_HEIGHT);
+            }
+            return new Dimension(super.getPreferredSize().width, WINDOW_HEIGHT + BUTTON_HEIGHT);
+        }
+
     }
 
 }
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java
index e823f3061c..6c21c10cba 100644
--- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java
@@ -40,8 +40,8 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     // 是否支持透明
     private boolean isSupportTransparent;
 
-    private final static int TRANSPANENT_WINDOW_HEIGHT = 165;
-    private final static int WINDWO_HEIGHT = 150;
+    public final static int TRANSPARENT_WINDOW_HEIGHT = 165;
+    public final static int WINDOW_HEIGHT = 150;
 
     // 最近使用颜色
     private UsedColorPane usedColorPane;
@@ -105,6 +105,10 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         centerPane.add(centerPane1);
     }
 
+    public boolean isSupportTransparent() {
+        return isSupportTransparent;
+    }
+
     public void setSupportTransparent(boolean supportTransparent) {
         isSupportTransparent = supportTransparent;
     }
@@ -208,9 +212,9 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     @Override
     public Dimension getPreferredSize() {
         if (isSupportTransparent) {
-            return new Dimension(super.getPreferredSize().width, TRANSPANENT_WINDOW_HEIGHT);
+            return new Dimension(super.getPreferredSize().width, TRANSPARENT_WINDOW_HEIGHT);
         }
-        return new Dimension(super.getPreferredSize().width, WINDWO_HEIGHT);
+        return new Dimension(super.getPreferredSize().width, WINDOW_HEIGHT);
     }
 
     /**