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 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 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 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