Merge pull request #1090 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0

* commit '1647d64000b0ec239aa68296487455b064feaa5d':
  rollback,这个bug的pr给kerry那边一起提
  REPORT-3895 [9.0一轮回归]渐变色左边箭头不易操作，右边箭头不显示如附件图片 REPORT-3896 [9.0一轮回归]样式单元格背景图案的前景和背景选择按钮只显示一半如附件图片

designer_base/src/com/fr/design/mainframe/backgroundpane/GradientBackgroundQuickPane.java

@@ -22,7 +22,7 @@ import java.awt.*;
 public class GradientBackgroundQuickPane extends BackgroundQuickPane {
 	private static final long serialVersionUID = -6854603990673031897L;
 
-    private static final int DEFAULT_GRADIENT_WIDTH = 185;
+    private static final int DEFAULT_GRADIENT_WIDTH = 150	;
 
     private int gradientBarWidth = DEFAULT_GRADIENT_WIDTH;
 
@@ -52,7 +52,7 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane {
 
         Component[][] components = new Component[][]{
                 new Component[]{gradientBar, null},
-                new Component[]{new UILabel(Inter.getLocText("Gradient-Direction") + ":"), directionPane}
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Gradient_Direction")), directionPane}
         };
         JPanel Gradient = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         this.setLayout(new BorderLayout());

designer_base/src/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java

@@ -61,17 +61,14 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane {
 		contentPane.add(southPane, BorderLayout.NORTH);
 		this.add(contentPane, BorderLayout.CENTER);
 
-		JPanel selectFilePane = new JPanel(new GridLayout(0, 2));
 
 		UIButton selectPictureButton = new UIButton(Inter.getLocText("Image-Select_Picture"));
-		selectFilePane.add(new JPanel());
-		selectFilePane.add(selectPictureButton);
 		selectPictureButton.addActionListener(selectPictureActionListener);
 
         if(hasImageLayout){
-            southPane.add(imageLayoutPane, BorderLayout.CENTER);
+            southPane.add(imageLayoutPane, BorderLayout.SOUTH);
         }
-		southPane.add(selectFilePane, BorderLayout.SOUTH);
+		southPane.add(selectPictureButton, BorderLayout.CENTER);
 
 		imageLayoutPane.addChangeListener(new ChangeListener() {
 

designer_base/src/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java

@@ -2,14 +2,17 @@ package com.fr.design.mainframe.backgroundpane;
 
 import com.fr.base.GraphHelper;
 import com.fr.base.background.PatternBackground;
-import com.fr.design.constants.UIConstants;
 import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.style.color.ColorSelectBox;
 import com.fr.general.Background;
 import com.fr.general.Inter;
-import com.fr.design.style.color.ColorSelectBox;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -26,7 +29,7 @@ import java.awt.geom.Rectangle2D;
 public class PatternBackgroundQuickPane extends BackgroundQuickPane {
 
     private int patternIndex = 0; // pattern setIndex.
-	private final static int DEFAULT_DIM_HEIGHT = 190;
+    private final static int DEFAULT_DIM_HEIGHT = 210;
     private ColorSelectBox foregroundColorPane;
     private ColorSelectBox backgroundColorPane;
     private PatternButton[] patternButtonArray;
@@ -47,11 +50,20 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
             patternButtonGroup.add(patternButtonArray[i]);
             typePane2.add(patternButtonArray[i]);
         }
-		JPanel colorPane = new JPanel(new GridLayout(0, 2));
-		foregroundColorPane = new ColorSelectBox(70);
-		backgroundColorPane = new ColorSelectBox(70);
-		colorPane.add(this.createLabelColorPane(Inter.getLocText("FR-Designer_Foreground") + ":", foregroundColorPane));
-		colorPane.add(this.createLabelColorPane(Inter.getLocText("FR-Designer_Background") + ":", backgroundColorPane));
+        foregroundColorPane = new ColorSelectBox(60);
+        backgroundColorPane = new ColorSelectBox(60);
+
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Foreground"), UILabel.LEFT), foregroundColorPane},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background"), UILabel.LEFT), backgroundColorPane},
+        };
+        double[] rowSize = {p, p, p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
+        JPanel colorPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_LARGE);
         this.add(colorPane, BorderLayout.CENTER);
         foregroundColorPane.addSelectChangeListener(colorChangeListener);
         backgroundColorPane.addSelectChangeListener(colorChangeListener);

designer_base/src/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java

@@ -33,7 +33,6 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane {
 		this.add(borderPane, BorderLayout.NORTH);
 		contentPane.setLayout(new GridLayout(0, 8, 1, 1));
 		contentPane.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
-		borderPane.setPreferredSize(new Dimension(0, 145));
 		ButtonGroup patternButtonGroup = new ButtonGroup();
 		textureButtonArray = new TextureButton[EMBED_TEXTURE_PAINT_ARRAY.length];
 		for (int i = 0; i < EMBED_TEXTURE_PAINT_ARRAY.length; i++) {