Browse Source

REPORT-6258 tab标签右击时原本的移动功能被覆盖了=>非绝对布局下,排序按钮灰化

plough 7 years ago
parent
commit
8d36dd3794
  1. 8
      designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java
  2. 5
      designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
  3. 8
      designer_form/src/com/fr/design/mainframe/FormDesigner.java

8
designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java

@ -564,4 +564,12 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
return false;
}
/**
* 内部组件是否支持叠加顺序的调整
* return boolean
*/
public boolean supportInnerOrderChangeActions() {
return false;
}
}

5
designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java

@ -515,4 +515,9 @@ public class XWAbsoluteLayout extends XLayoutContainer {
widget.setBounds(xCreator.getBounds());
}
}
@Override
public boolean supportInnerOrderChangeActions() {
return true;
}
}

8
designer_form/src/com/fr/design/mainframe/FormDesigner.java

@ -1139,8 +1139,8 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
// 当前选中控件可以上移一层吗?
public boolean isCurrentComponentMovableUp() {
XCreator creator = getSelectionModel().getSelection().getSelectedCreator();
Container container = creator.getParent();
if (container == null) {
XLayoutContainer container = (XLayoutContainer) creator.getParent();
if (container == null || !container.supportInnerOrderChangeActions()) {
return false;
}
return creator.isMovable() && container.getComponentZOrder(creator) > 0;
@ -1149,8 +1149,8 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
// 当前选中控件可以下移一层吗?
public boolean isCurrentComponentMovableDown() {
XCreator creator = getSelectionModel().getSelection().getSelectedCreator();
Container container = creator.getParent();
if (container == null) {
XLayoutContainer container = (XLayoutContainer) creator.getParent();
if (container == null || !container.supportInnerOrderChangeActions()) {
return false;
}
return creator.isMovable() && container.getComponentZOrder(creator) < container.getComponentCount() - 1;

Loading…
Cancel
Save