From 92981d755a2a97c24c9514576e9dedcaef86f378 Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 21 Nov 2023 14:24:46 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-107652=20=E3=80=90=E6=9C=80=E5=BC=BA?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E3=80=91=E5=8D=95=E5=85=83=E6=A0=BC=E7=9A=84?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8E=A7=E4=BB=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=90=8E=E5=85=B3=E9=97=AD=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=BC=BA=EF=BC=8C=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/widget/ui/btn/FreeButtonDetailPane.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 c2f0ed4f3..71b5d2ad5 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 @@ -3,6 +3,7 @@ package com.fr.design.widget.ui.btn; import java.awt.Component; import com.fr.form.ui.FreeButton; +import com.fr.widgettheme.util.WidgetThemeDesignerUtils; /** * 自定义按钮 @@ -16,7 +17,7 @@ public class FreeButtonDetailPane extends AbstractExtraButtonPane { @Override protected Component createCenterPane() { - buttonSytleDefinedPane = new ButtonSytleDefinedPane(); + buttonSytleDefinedPane = WidgetThemeDesignerUtils.enableWidgetEnhance() ? null : new ButtonSytleDefinedPane(); return createExtraPane(buttonSytleDefinedPane); } @@ -27,13 +28,17 @@ public class FreeButtonDetailPane extends AbstractExtraButtonPane { public void populate(FreeButton button) { super.populate(button); - buttonSytleDefinedPane.populate(button); + if (buttonSytleDefinedPane != null) { + buttonSytleDefinedPane.populate(button); + } } @Override public FreeButton update() { FreeButton button = super.update(); - buttonSytleDefinedPane.update(button); + if (buttonSytleDefinedPane != null) { + buttonSytleDefinedPane.update(button); + } return button; }