Browse Source

把显示增强判断抽到抽象类,传boolean给实现类

release/11.0
obo 1 year ago
parent
commit
2f316e5213
  1. 5
      designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
  2. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java
  3. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java
  4. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java
  5. 4
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java
  6. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java

5
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.无自定义按钮

2
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);
}

2
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);
}

2
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);
}

4
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);
}

2
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;
}

Loading…
Cancel
Save