Browse Source

Pull request #13381: REPORT-111549 标签控件设置的字体背景样式等,开启控件增强,之前设置的样式丢了

Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0

* commit 'b41984c788d114b14ea9645f99f1bf803380b7bd':
  改下实现
  REPORT-111549 标签控件设置的字体背景样式等,开启控件增强,之前设置的样式丢了
release/11.0
Obo-王学仁 1 year ago
parent
commit
1a106194c3
  1. 5
      designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java

5
designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java

@ -38,6 +38,11 @@ public class LabelSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
LabelTheme widgetTheme = (LabelTheme) t.getWidgetTheme();
if (widgetTheme == null) {
widgetTheme = new LabelTheme();
Label label = (Label) t;
if (!label.getDefaultFont().equals(label.getFont())) {
widgetTheme.setFollowTheme(false);
widgetTheme.setFontStyle(new FontStyle((label.getFont())));
}
t.setWidgetTheme(widgetTheme);
}
return widgetTheme;

Loading…
Cancel
Save