Browse Source

REPORT-55070【组件背景分离】 组件复用-tab块点击右侧添加标签按钮,没生效

feature/10.0
hades 4 years ago
parent
commit
1a52132587
  1. 7
      designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

7
designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

@ -19,6 +19,7 @@ import com.fr.design.designer.creator.XEditorHolder;
import com.fr.design.designer.creator.XElementCase;
import com.fr.design.designer.creator.XLayoutContainer;
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.XWCardLayout;
import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
@ -623,7 +624,9 @@ public class EditingMouseListener extends MouseInputAdapter {
creator = processTopLayoutMouseClick(creator);
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);
selectionModel.selectACreatorAtMouseEvent(e);
refreshTopXCreator();
@ -631,7 +634,7 @@ public class EditingMouseListener extends MouseInputAdapter {
for (XCreator xCreator : xCreators) {
xCreator.setSelected(true);
}
} else if (responseTabLayout(oldCreator, e)) {
} else if (clickedNonCardButton && responseTabLayout(oldCreator, e)) {
// do nothing
} else {
creator.respondClick(this, e);

Loading…
Cancel
Save