From ea06a7b22458583df9cf14eecf94fe49812390c2 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 20 Aug 2020 12:25:29 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-37821=20=20frm=E7=BB=9D=E5=AF=B9?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=A1=86=E9=80=89=E5=A4=9A=E4=B8=AA=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/EditingMouseListener.java    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java b/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java
index 3754e5109..2fa3dea64 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java
@@ -195,6 +195,7 @@ public class EditingMouseListener extends MouseInputAdapter {
      */
     public void mouseReleased(MouseEvent e) {
         MouseEvent transEvent = new MouseEvent(e.getComponent(), MouseEvent.MOUSE_CLICKED, e.getWhen(), e.getModifiers(),  e.getX(), e.getY(),  e.getXOnScreen(), e.getYOnScreen(), e.getClickCount(), e.isPopupTrigger(), e.getButton());
+        MouseEvent clickEvent = new MouseEvent(e.getComponent(), MouseEvent.MOUSE_CLICKED, e.getWhen(), e.getModifiers(),  e.getX(), e.getY(),  e.getXOnScreen(), e.getYOnScreen(), e.getClickCount(), e.isPopupTrigger(), e.getButton());
         int oldX = e.getX();
         int oldY = e.getY();
         offsetEventPoint(e);
@@ -219,14 +220,21 @@ public class EditingMouseListener extends MouseInputAdapter {
         lastPressEvent = null;
         lastXCreator = null;
         e.translatePoint(oldX - e.getX(), oldY - e.getY());
-        if (pressX != oldX || pressY != oldY) {
+        if (isAutoFire(transEvent, clickEvent)) {
             // click只有在mouseReleased和mousePressed前后x/y坐标相等时才会被触发在mouseReleased之后
             // 但是当使用者来回点击切换时 存在mouseReleased和mousePressed前后x/y坐标不相等的情况 即鼠标按下去的位置和鼠标释放的位置不相等 存在偏移
             // 当这种偏移很小时 看起来就好像是点击了 实际上是手抖了或者鼠标轻微滑动了 所以这里对这种情况要有容错处理
-            mouseClicked(transEvent);
+            mouseClicked(clickEvent);
         }
     }
 
+    private boolean isAutoFire(MouseEvent transEvent, MouseEvent clickEvent ) {
+        offsetEventPoint(transEvent);
+        XCreator xCreator = designer.getComponentAt(transEvent);
+        return (pressX != clickEvent.getX() || pressY != clickEvent.getY())
+                && xCreator != null && xCreator.acceptType(XCardSwitchButton.class);
+    }
+
     private void mouseDraggingRelease(MouseEvent e) {
         // 当前鼠标所在的组件
         XCreator hoveredComponent = designer.getComponentAt(e.getX(), e.getY());