|
|
@ -19,6 +19,7 @@ import com.fr.design.designer.creator.XEditorHolder; |
|
|
|
import com.fr.design.designer.creator.XElementCase; |
|
|
|
import com.fr.design.designer.creator.XElementCase; |
|
|
|
import com.fr.design.designer.creator.XLayoutContainer; |
|
|
|
import com.fr.design.designer.creator.XLayoutContainer; |
|
|
|
import com.fr.design.designer.creator.XWFitLayout; |
|
|
|
import com.fr.design.designer.creator.XWFitLayout; |
|
|
|
|
|
|
|
import com.fr.design.designer.creator.cardlayout.XCardAddButton; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XCardSwitchButton; |
|
|
|
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; |
|
|
@ -623,7 +624,9 @@ public class EditingMouseListener extends MouseInputAdapter { |
|
|
|
creator = processTopLayoutMouseClick(creator); |
|
|
|
creator = processTopLayoutMouseClick(creator); |
|
|
|
|
|
|
|
|
|
|
|
if (creator != null) { |
|
|
|
if (creator != null) { |
|
|
|
if (e.getClickCount() == 1 && designer.getCursor().getType() != Cursor.HAND_CURSOR) { |
|
|
|
// 点击不在tab块的button中
|
|
|
|
|
|
|
|
boolean clickedNonCardButton = !creator.acceptType(XCardAddButton.class, XCardSwitchButton.class); |
|
|
|
|
|
|
|
if (clickedNonCardButton && e.getClickCount() == 1 && designer.getCursor().getType() != Cursor.HAND_CURSOR) { |
|
|
|
setCoverPaneNotDisplay(creator, e, false); |
|
|
|
setCoverPaneNotDisplay(creator, e, false); |
|
|
|
selectionModel.selectACreatorAtMouseEvent(e); |
|
|
|
selectionModel.selectACreatorAtMouseEvent(e); |
|
|
|
refreshTopXCreator(); |
|
|
|
refreshTopXCreator(); |
|
|
@ -631,7 +634,7 @@ public class EditingMouseListener extends MouseInputAdapter { |
|
|
|
for (XCreator xCreator : xCreators) { |
|
|
|
for (XCreator xCreator : xCreators) { |
|
|
|
xCreator.setSelected(true); |
|
|
|
xCreator.setSelected(true); |
|
|
|
} |
|
|
|
} |
|
|
|
} else if (responseTabLayout(oldCreator, e)) { |
|
|
|
} else if (clickedNonCardButton && responseTabLayout(oldCreator, e)) { |
|
|
|
// do nothing
|
|
|
|
// do nothing
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
creator.respondClick(this, e); |
|
|
|
creator.respondClick(this, e); |
|
|
|