REPORT-137556 & REPORT-137644 fix 服务器配置颜色块布局 & 背景默认值

designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleBackgroundEditor.java

@@ -7,6 +7,7 @@ import java.awt.*;
 
 import javax.swing.*;
 
+import com.fine.theme.utils.FineUIScale;
 import com.fr.general.Background;
 import com.fr.design.mainframe.widget.wrappers.BackgroundWrapper;
 import com.fr.design.dialog.BasicDialog;
@@ -29,7 +30,7 @@ public class AccessibleBackgroundEditor extends UneditableAccessibleEditor {
     protected void showEditorPane() {
         if (backgroundPane == null) {
             backgroundPane = new BackgroundPane();
-            backgroundPane.setPreferredSize(new Dimension(600, 400));
+            backgroundPane.setPreferredSize(FineUIScale.createScaleDimension(600, 400));
         }
         BasicDialog dlg = backgroundPane.showWindow(SwingUtilities.getWindowAncestor(this));
         dlg.addDialogActionListener(new DialogActionAdapter() {

designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java

@@ -92,6 +92,7 @@ public class BackgroundPane extends BasicPane {
             quickPane = BackgroundFactory.createIfAbsent(background == null ? null : background.getClass());
             cacheMap.put(index, quickPane);
         }
+        tabbedPane.setSelectedIndex(index);
         return quickPane;
     }
 

designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

@@ -267,7 +267,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
 
     private void initMenuColorPane() {
-        menuColorPane.setLayout(new GridLayout(5, 8, DEFAULT_COLOR_HOR_INTERVAL, 0));
+        menuColorPane.setLayout(new GridLayout(4, 10, DEFAULT_COLOR_HOR_INTERVAL, 0));
         Color[] colorArray = this.getColorArray();
         for (int i = 0; i < colorArray.length; i++) {
             Color color = colorArray[i] == null ? UsedColorPane.DEFAULT_COLOR : colorArray[i];