From 093085b7ffdf03780fcbe18218f29011a32523de Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 1 Dec 2017 14:51:55 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-4634=20=E7=BB=84=E4=BB=B6=E5=8F=A0?= =?UTF-8?q?=E5=8A=A0=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96=3D>1=3D>tabpane?= =?UTF-8?q?=20=E7=82=B9=E5=87=BB=E6=8E=A7=E4=BB=B6=E6=A0=91=E9=80=80?= =?UTF-8?q?=E5=87=BA=E7=BC=96=E8=BE=91=EF=BC=88tabpane=E7=9A=84=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E6=9C=89=E7=82=B9=E5=A5=87=E6=80=AA=EF=BC=8C=E5=85=88?= =?UTF-8?q?=E4=B8=8D=E7=AE=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/EditingMouseListener.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java b/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java index 7d606b66c..cad41b913 100644 --- a/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java +++ b/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java @@ -11,6 +11,7 @@ import com.fr.design.designer.beans.models.SelectionModel; import com.fr.design.designer.beans.models.StateModel; import com.fr.design.designer.creator.*; import com.fr.design.designer.creator.cardlayout.XCardSwitchButton; +import com.fr.design.designer.creator.cardlayout.XWCardLayout; import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.xpane.ToolTipEditor; @@ -491,7 +492,8 @@ public class EditingMouseListener extends MouseInputAdapter { // 点击控件树，会触发此方法。如果在设计器中选中组件，则直接走 processTopLayoutMouseClick public void stopEditTopLayout(XCreator creator) { - if (clickTopLayout != null && clickTopLayout.equals(creator)) { + boolean isTabpaneSelected = creator instanceof XWCardLayout && creator.getParent().equals(clickTopLayout); + if (clickTopLayout != null && (isTabpaneSelected || clickTopLayout.equals(creator))) { clickTopLayout.setEditable(false); } processTopLayoutMouseClick(creator);