Browse Source

Merge branch 'final/10.0' of https://code.fineres.com/scm/~henry.wang/design into final/10.0

final/10.0
Henry.Wang 3 years ago
parent
commit
51f32cd93b
  1. 16
      designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java

16
designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java

@ -84,24 +84,22 @@ public class FormSelectionUtils {
} }
private static FormSelection filterFormSelection(FormSelection clipboard, XLayoutContainer parent) { private static FormSelection filterFormSelection(FormSelection clipboard, XLayoutContainer parent) {
FormSelection newSelection = new FormSelection();
for (XCreator xCreator : clipboard.getSelectedCreators()) { for (XCreator xCreator : clipboard.getSelectedCreators()) {
if (parent.acceptType(XWParameterLayout.class)) { if (parent.acceptType(XWParameterLayout.class)) {
if (xCreator.canEnterIntoParaPane()) { if (!xCreator.canEnterIntoParaPane()) {
newSelection.addSelectedCreator(xCreator); clipboard.removeCreator(xCreator);
} }
} else if (parent.acceptType(XWAbsoluteLayout.class)) { } else if (parent.acceptType(XWAbsoluteLayout.class)) {
if (xCreator.canEnterIntoAbsolutePane()) { if (!xCreator.canEnterIntoAbsolutePane()) {
newSelection.addSelectedCreator(xCreator); clipboard.removeCreator(xCreator);
} }
} else if (parent.acceptType(XWFitLayout.class)) { } else if (parent.acceptType(XWFitLayout.class)) {
if (xCreator.canEnterIntoAdaptPane()) { if (!xCreator.canEnterIntoAdaptPane()) {
newSelection.addSelectedCreator(xCreator); clipboard.removeCreator(xCreator);
} }
} }
} }
return newSelection; return clipboard;
} }
private static boolean isExtraContainer(XLayoutContainer parent) { private static boolean isExtraContainer(XLayoutContainer parent) {

Loading…
Cancel
Save