Browse Source

1、抽常量

2、删注释
feature/x
obo 1 year ago
parent
commit
ea0e699043
  1. 4
      designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java
  2. 2
      designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java

4
designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java

@ -77,7 +77,7 @@ public class WidgetStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<
} }
private void initCommonStyleEditor() { private void initCommonStyleEditor() {
colorSelectBox = new NewColorSelectBox(140, true); colorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);
colorSelectBox.setSelectObject(WidgetThemeDisplayConstants.DEFAULT_THEME_COLOR); colorSelectBox.setSelectObject(WidgetThemeDisplayConstants.DEFAULT_THEME_COLOR);
initLineBox(); initLineBox();
borderRadiusSpinner = new UISpinner(0, Integer.MAX_VALUE, 1); borderRadiusSpinner = new UISpinner(0, Integer.MAX_VALUE, 1);
@ -86,7 +86,7 @@ public class WidgetStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<
} }
protected void initTextStylePane() { protected void initTextStylePane() {
textStylePane = new WidgetTextStylePane(FRFontPane.getFontSizes(), 140); textStylePane = new WidgetTextStylePane(FRFontPane.getFontSizes(), WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH);
} }
/** /**

2
designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java

@ -270,14 +270,12 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
borderRadiusSpinner.setValue(BorderStyle.DEFAULT_BORDER_RADIUS); borderRadiusSpinner.setValue(BorderStyle.DEFAULT_BORDER_RADIUS);
} }
if (textStylePane != null) { if (textStylePane != null) {
//后面看看怎么设置默认背景色
textStylePane.setTextStyle(new TextStyle()); textStylePane.setTextStyle(new TextStyle());
} }
if (frFontPane != null) { if (frFontPane != null) {
frFontPane.populateBean(FRFont.getInstance()); frFontPane.populateBean(FRFont.getInstance());
} }
if (selectBgColorBox != null) { if (selectBgColorBox != null) {
//后面看看怎么设置默认背景色
selectBgColorBox.setSelectObject(null); selectBgColorBox.setSelectObject(null);
} }
} }

Loading…
Cancel
Save