Browse Source

Merge pull request #5161 in DESIGN/design from feature/10.0 to research/10.0

* commit 'c89934721e2ccf74cbcb6f6c7b05df1891fa4beb':
  REPORT-56010 【组件背景分离】组件复用-组件不显示 标题,设置边框后设计期内边框不显示
research/10.0
superman 3 years ago
parent
commit
44b7be9a1d
  1. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java
  2. 7
      designer-form/src/main/java/com/fr/design/designer/creator/XWTitleLayout.java

4
designer-form/src/main/java/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java

@ -210,6 +210,10 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
reshuffleBorderPaintingEffectIfTitleExists(titleParent, titleCreator, bodyXCreator);
reshuffleBackgroundPaintingEffectIfTitleExists(titleParent, titleCreator, bodyXCreator);
} else {
titleParent.setBorder(null);
titleParent.setBorderImage4Painting(null, 0.0);
titleParent.setBackground4Painting(null, 0.0);
}
}
}

7
designer-form/src/main/java/com/fr/design/designer/creator/XWTitleLayout.java

@ -62,6 +62,13 @@ public class XWTitleLayout extends DedicateLayoutContainer {
this.bodyBackgroundOpacity4Painting = opacity;
}
@Override
protected void initBorderAndBackgroundStyle() {
setBorder(null);
setBorderImage4Painting(null, 0.0);
setBackground4Painting(null, 0.0);
}
@Override
protected void initXCreatorProperties() {
super.initXCreatorProperties();

Loading…
Cancel
Save