Browse Source

Merge pull request #380 in BA/design from ~ZHOUPING/design:dev to dev

* commit 'd8022b8ad31e20f655de9e60b144e5fba7e0b274':
  无JIRA任务 修复初始化布局改动造成的npe问题
master
superman 8 years ago
parent
commit
24a9831595
  1. 1
      designer_form/src/com/fr/design/mainframe/ComponentTree.java

1
designer_form/src/com/fr/design/mainframe/ComponentTree.java

@ -281,6 +281,7 @@ public class ComponentTree extends JTree {
}
//绝对布局作为body的时候不显示自适应布局父层
if (((XCreator) parent).acceptType(XWAbsoluteLayout.class)
&& (parent.getParent() != null)
&& ((XCreator)parent.getParent()).acceptType(XWFitLayout.class)
&& ((XWAbsoluteLayout)parent).toData().isAbsoluteLayoutAsBody()){
parent = parent.getParent().getParent();

Loading…
Cancel
Save