From 2ed62939b9191e350937d0c1a46cd949e491ff9b Mon Sep 17 00:00:00 2001
From: renekton <Renekton@fanruan.com>
Date: Tue, 10 Sep 2024 20:12:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E5=AE=9A=E5=A5=BD=E7=9A=84=E5=B8=B8?=
 =?UTF-8?q?=E9=87=8F=E6=9B=BF=E4=BB=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gui/style/AbstractTranslucentBackgroundSpecialPane.java  | 5 +++--
 .../com/fr/design/gui/style/ComponentIntegralStylePane.java  | 3 ++-
 .../com/fr/design/gui/style/ComponentTitleStylePane.java     | 5 +++--
 .../gui/style/TextInsetImageBackgroundSpecialPane.java       | 3 ++-
 .../theme/edit/component/ComponentMarginStylePane.java       | 3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/style/AbstractTranslucentBackgroundSpecialPane.java b/designer-base/src/main/java/com/fr/design/gui/style/AbstractTranslucentBackgroundSpecialPane.java
index bd6d633f33..8d0c572da5 100644
--- a/designer-base/src/main/java/com/fr/design/gui/style/AbstractTranslucentBackgroundSpecialPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/AbstractTranslucentBackgroundSpecialPane.java
@@ -2,6 +2,7 @@ package com.fr.design.gui.style;
 
 import com.fine.theme.utils.FineLayoutBuilder;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.UIPercentDragPane;
@@ -58,14 +59,14 @@ public abstract class AbstractTranslucentBackgroundSpecialPane<T extends Backgro
                 new JComponent[][]{
                         {backgroundLabelPane, backgroundPane}
                 },
-                new double[]{1.2, 3});
+                new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
 
         JPanel opacityComposedPane = FineLayoutBuilder.compatibleTableLayout(10,
                 new JComponent[][]{
                         {new UILabel(""), FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
                         {new UILabel(""), opacityPane}
                 },
-                new double[]{1.2, 3});
+                new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
         opacityComposedPane.setBorder(new ScaledEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
         opacityComposedPane.setVisible(false);
 
diff --git a/designer-base/src/main/java/com/fr/design/gui/style/ComponentIntegralStylePane.java b/designer-base/src/main/java/com/fr/design/gui/style/ComponentIntegralStylePane.java
index 476fb2529e..65c72b6d2d 100644
--- a/designer-base/src/main/java/com/fr/design/gui/style/ComponentIntegralStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/ComponentIntegralStylePane.java
@@ -1,6 +1,7 @@
 package com.fr.design.gui.style;
 
 import com.fine.theme.utils.FineLayoutBuilder;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ispinner.UISpinner;
@@ -72,7 +73,7 @@ public class ComponentIntegralStylePane extends AbstractBorderPackerPane {
                         {this.borderPane, null},
                         {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")), cornerSpinner},
                 },
-                new double[]{1.2, 3});
+                new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
 
         this.add(content, BorderLayout.NORTH);
     }
diff --git a/designer-base/src/main/java/com/fr/design/gui/style/ComponentTitleStylePane.java b/designer-base/src/main/java/com/fr/design/gui/style/ComponentTitleStylePane.java
index e391cde959..d8167d090a 100644
--- a/designer-base/src/main/java/com/fr/design/gui/style/ComponentTitleStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/ComponentTitleStylePane.java
@@ -3,6 +3,7 @@ package com.fr.design.gui.style;
 import com.fine.theme.utils.FineLayoutBuilder;
 import com.fr.base.Utils;
 import com.fr.base.svg.IconUtils;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
@@ -191,7 +192,7 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
 
         return FineLayoutBuilder.compatibleTableLayout(10,
                 new JComponent[][]{{FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), textContentPane}},
-                new double[]{1.2, 3});
+                new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
     }
 
     private JPanel createTitleOtherSettingPane() {
@@ -211,7 +212,7 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
 
         JPanel buttonPane = FineLayoutBuilder.compatibleTableLayout(10, new JComponent[][] {
                 {fontSizeComboBox, fontColorSelectPane, fontItalicButton, fontBoldButton, fontUnderlineButton},
-        }, new double[]{1.2, 3});
+        }, new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
 
         JPanel containerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         containerPane.add(buttonPane, BorderLayout.NORTH);
diff --git a/designer-base/src/main/java/com/fr/design/gui/style/TextInsetImageBackgroundSpecialPane.java b/designer-base/src/main/java/com/fr/design/gui/style/TextInsetImageBackgroundSpecialPane.java
index 59f0d8c1bd..61872ff7b9 100644
--- a/designer-base/src/main/java/com/fr/design/gui/style/TextInsetImageBackgroundSpecialPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/TextInsetImageBackgroundSpecialPane.java
@@ -5,6 +5,7 @@ import com.fr.base.Style;
 import com.fr.base.background.ImageBackground;
 import com.fr.base.background.ImageFileBackground;
 import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.event.UIObserver;
@@ -163,7 +164,7 @@ public class TextInsetImageBackgroundSpecialPane extends JPanel implements UIObs
                         {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Inset_Padding"))},
                         {null, this.imagePaddingPane}
                 },
-                new double[]{1.2, 3});
+                new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
     }
 
     private void initImageFileChooserIfNotExist() {
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/component/ComponentMarginStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/component/ComponentMarginStylePane.java
index 5e5d43a6b1..ef66eb5515 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/component/ComponentMarginStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/component/ComponentMarginStylePane.java
@@ -2,6 +2,7 @@ package com.fr.design.mainframe.theme.edit.component;
 
 import com.fine.theme.utils.FineLayoutBuilder;
 import com.fr.base.theme.settings.ThemedComponentStyle;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
@@ -53,7 +54,7 @@ public class ComponentMarginStylePane extends JPanel {
 
         JPanel panel = FineLayoutBuilder.compatibleTableLayout(10,
                 new Component[][]{new Component[]{uiLabel, createPaddingPane()}},
-                new double[]{1.2, 3}
+                new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT}
         );
         this.add(panel);
     }