From 44f40a77f0986be889de333a01b3a64bdb2ecc06 Mon Sep 17 00:00:00 2001
From: "Bruce.Deng" <bruce.deng@fanruan.com>
Date: Thu, 9 Mar 2023 20:02:56 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-83259=20&=20REPORT-83263=20=E3=80=90?=
 =?UTF-8?q?=E6=9C=80=E5=BC=BA=E6=8E=A7=E4=BB=B6=E3=80=91=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B7=9F=E9=9A=8F=E4=B8=BB=E9=A2=98&?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/ui/designer/ButtonDefinePane.java   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java
index 0b0f73475..ed51d0469 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java
@@ -48,19 +48,19 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
         labelNameTextField = new UITextField();
         UILabel backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background"));
         backgroundLabel.setVerticalAlignment(SwingConstants.TOP);
-        initExtraPane();
+        initAdvancedPane();
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         boundsPane.add(extraPane);
         UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, boundsPane);
         this.add(advancedPane);
     }
 
-    private void initExtraPane() {
+    private void initAdvancedPane() {
         initPluginListener();
-        refreshExtraAdvancedPane();
+        refreshAdvancedPane();
     }
 
-    private void refreshExtraAdvancedPane() {
+    private void refreshAdvancedPane() {
         extraPaneList.clear();
         boolean containsExtraPane = false;
         Set<WidgetAdvancedPaneProvider<T>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
@@ -71,12 +71,16 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
             insertShortCut(provider.getInsertPosition(extraPaneList.size()), provider.createExtraAdvancedPane());
             containsExtraPane = true;
         }
+        refreshAdvancedPane(containsExtraPane);
+    }
+
+    private void refreshAdvancedPane(boolean containsExtraPane) {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         Component[] backgroundCompPane = createBackgroundComp();
         Component[] frFont = createFontPane();
-        double rowSize[];
-        double columnSize[];
+        double[] rowSize;
+        double[] columnSize;
         int[][] rowCount;
         Component[][] n_components;
         if (containsExtraPane) {
@@ -116,7 +120,7 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
         GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
             @Override
             public void on(PluginEvent event) {
-                refreshExtraAdvancedPane();
+                refreshAdvancedPane();
             }
         }, pluginContext -> pluginContext.getRuntime().contain(WidgetAdvancedPaneProvider.XML_TAG));
     }