|
|
@ -85,13 +85,14 @@ public class SelectionModel { |
|
|
|
if (e.getButton() == MouseEvent.BUTTON3 || (!InputEventBaseOnOS.isControlDown(e) && !e.isShiftDown())) { |
|
|
|
if (e.getButton() == MouseEvent.BUTTON3 || (!InputEventBaseOnOS.isControlDown(e) && !e.isShiftDown())) { |
|
|
|
// 如果Ctrl或者Shift键盘没有按下,则清除已经选择的组件
|
|
|
|
// 如果Ctrl或者Shift键盘没有按下,则清除已经选择的组件
|
|
|
|
XCreator selectXCreator = selection.getSelectedCreator(); |
|
|
|
XCreator selectXCreator = selection.getSelectedCreator(); |
|
|
|
if (selectXCreator != null && comp != null) { |
|
|
|
boolean clickOnce = e.getClickCount() == 1; |
|
|
|
|
|
|
|
boolean hasCom = selectXCreator != null && comp != null; |
|
|
|
|
|
|
|
if (clickOnce && hasCom) { |
|
|
|
if (StringUtils.equals(selectXCreator.toData().getWidgetName(), comp.toData().getWidgetName())) { |
|
|
|
if (StringUtils.equals(selectXCreator.toData().getWidgetName(), comp.toData().getWidgetName())) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
selection.reset(); |
|
|
|
selection.reset(); |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
//按下Ctrl或者shift键时鼠标可以进行多选,两次点击同一控件就取消选中
|
|
|
|
//按下Ctrl或者shift键时鼠标可以进行多选,两次点击同一控件就取消选中
|
|
|
|
XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer(comp).getTopLayout(); |
|
|
|
XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer(comp).getTopLayout(); |
|
|
|