|
|
@ -15,6 +15,7 @@ import com.fr.design.designer.creator.XWAbsoluteBodyLayout; |
|
|
|
import com.fr.design.designer.creator.XWAbsoluteLayout; |
|
|
|
import com.fr.design.designer.creator.XWAbsoluteLayout; |
|
|
|
import com.fr.design.designer.creator.XWFitLayout; |
|
|
|
import com.fr.design.designer.creator.XWFitLayout; |
|
|
|
import com.fr.design.designer.creator.XWParameterLayout; |
|
|
|
import com.fr.design.designer.creator.XWParameterLayout; |
|
|
|
|
|
|
|
import com.fr.design.designer.creator.cardlayout.XCardSwitchButton; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWCardLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWCardLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; |
|
|
@ -111,7 +112,7 @@ public class SelectionModel { |
|
|
|
if (comp != designer.getRootComponent() && comp != designer.getParaComponent()) { |
|
|
|
if (comp != designer.getRootComponent() && comp != designer.getParaComponent()) { |
|
|
|
XCreator parentContainer = (XCreator) comp.getParent(); |
|
|
|
XCreator parentContainer = (XCreator) comp.getParent(); |
|
|
|
if (parentContainer != null) { |
|
|
|
if (parentContainer != null) { |
|
|
|
comp = parentContainer.isDedicateContainer() ? parentContainer : comp; |
|
|
|
comp = parentContainer.isDedicateContainer() || comp instanceof XCardSwitchButton ? parentContainer : comp; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (selection.removeSelectedCreator(comp) || selection.addSelectedCreator(comp)) { |
|
|
|
if (selection.removeSelectedCreator(comp) || selection.addSelectedCreator(comp)) { |
|
|
|