From 2f316e52131e1f4889a14390c456c6210449562a Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Tue, 21 Nov 2023 19:59:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=8A=BD=E5=88=B0=E6=8A=BD=E8=B1=A1=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=A0boolean=E7=BB=99=E5=AE=9E=E7=8E=B0=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/widget/btn/ButtonWithHotkeysDetailPane.java    | 5 +++--
 .../fr/design/widget/ui/btn/AppendRowButtonDefinePane.java   | 2 +-
 .../com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java | 2 +-
 .../fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java   | 2 +-
 .../com/fr/design/widget/ui/btn/FreeButtonDetailPane.java    | 4 ++--
 .../design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
index d146c7309..f542afde3 100644
--- a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
+++ b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
@@ -16,6 +16,7 @@ import com.fr.design.mainframe.widget.accessibles.AccessibleIconEditor;
 import com.fr.form.ui.Button;
 
 import com.fr.stable.StableUtils;
+import com.fr.widgettheme.util.WidgetThemeDesignerUtils;
 
 /**
  * Created by IntelliJ IDEA.
@@ -43,7 +44,7 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
         JPanel labelPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         iconPane = new AccessibleIconEditor();
         labelPane.add(iconPane);
-        Component comp = createCenterPane();
+        Component comp = createCenterPane(WidgetThemeDesignerUtils.enableWidgetEnhance());
         Component[][] n_components = {
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type")), createCustomButtonTypeComboBox()},
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")), buttonNameTextField = new UITextField()},
@@ -62,7 +63,7 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
 
     }
 
-    protected abstract Component createCenterPane();
+    protected abstract Component createCenterPane(boolean needWidgetDisplayEnhance);
 
     /**
      * 判断是按钮控件下拉框的种类：1.有自定义按钮 2.无自定义按钮
diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java
index 981295a1e..8625e13e1 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java
@@ -29,7 +29,7 @@ public class AppendRowButtonDefinePane<T extends AppendRowButton> extends Abstra
 //    }
 
     @Override
-    protected Component createCenterPane() {
+    protected Component createCenterPane(boolean needWidgetDisplayEnhance) {
         defineColumnRowPane = new DefineAppendColumnRowPane();
         return createExtraPane(defineColumnRowPane);
     }
diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java
index 84239e904..c89537516 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java
@@ -18,7 +18,7 @@ import java.awt.*;
 public class DefaultButtonDetailPane extends AbstractExtraButtonPane<Button> {
 
     @Override
-    protected Component createCenterPane() {
+    protected Component createCenterPane(boolean needWidgetDisplayEnhance) {
         return createExtraPane(null);
     }
 
diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java
index 7476657e4..d7538d123 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java
@@ -17,7 +17,7 @@ public class DeleteRowButtonDefinePane<T extends DeleteRowButton> extends Abstra
     private DefineDeleteColumnRowPane ddcp;
 
     @Override
-    protected Component createCenterPane() {
+    protected Component createCenterPane(boolean needWidgetDisplayEnhance) {
         ddcp = new DefineDeleteColumnRowPane();
         return createExtraPane(ddcp);
     }
diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java
index 71b5d2ad5..6a1aa843b 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java
@@ -16,8 +16,8 @@ public class FreeButtonDetailPane extends AbstractExtraButtonPane<FreeButton> {
 	private ButtonSytleDefinedPane buttonSytleDefinedPane;
 
 	@Override
-	protected Component createCenterPane() {
-		buttonSytleDefinedPane = WidgetThemeDesignerUtils.enableWidgetEnhance() ? null : new ButtonSytleDefinedPane();
+	protected Component createCenterPane(boolean needWidgetDisplayEnhance) {
+		buttonSytleDefinedPane = needWidgetDisplayEnhance ? null : new ButtonSytleDefinedPane();
 		return createExtraPane(buttonSytleDefinedPane);
 	}
 
diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
index 1796b3e05..4a88660bd 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
@@ -46,7 +46,7 @@ public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> exte
     }
 
     @Override
-    protected Component createCenterPane() {
+    protected Component createCenterPane(boolean needWidgetDisplayEnhance) {
         return null;
     }