REPORT-1096 取色板=>调整自定义颜色选择界面的取色器按钮位置

designer_base/src/com/fr/design/style/color/CustomChooserPanel.java

@@ -1,15 +1,7 @@
 package com.fr.design.style.color;
 
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Graphics;
-import java.awt.GridLayout;
-import java.awt.Image;
-import java.awt.Point;
+import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.MemoryImageSource;
 import java.util.regex.Matcher;
@@ -709,12 +701,21 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec
         hexPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 8, 0));
         hexPanel.add(new UILabel("#"));
         hexPanel.add(field);
-        UIButton pickColorButton = PickColorButtonFactory.getPickColorButton(this, PickColorButtonFactory.IconType.ICON18, true);
-        hexPanel.add(pickColorButton);
 
         mainPanel.add(hslAndRgbPanel, BorderLayout.CENTER);
         mainPanel.add(hexPanel, BorderLayout.SOUTH);
 
+        JPanel rightPane = new JPanel(new BorderLayout());
+        UIButton pickColorButton = PickColorButtonFactory.getPickColorButton(this, PickColorButtonFactory.IconType.ICON18, true);
+        JPanel blankArea = new JPanel();
+        blankArea.setPreferredSize(new Dimension(100, 175));
+        rightPane.add(blankArea, BorderLayout.CENTER);
+        JPanel buttonPane = new JPanel(new BorderLayout());
+        buttonPane.add(pickColorButton, BorderLayout.WEST);
+        rightPane.add(buttonPane, BorderLayout.SOUTH);
+//        rightPane.add(pickColorButton, BorderLayout.SOUTH);
+        container.add(rightPane);
+
         return container;
     }