From 5aad600fee1278e9e90b38e239a69085a07877a9 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Wed, 19 Jul 2023 10:15:26 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-100623=20=E6=8E=A7=E4=BB=B6-=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=9D=A2=E6=9D=BF=E6=A0=B9=E6=8D=AE=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E7=9A=84=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=94=BE=E5=A4=A7=E5=90=8E=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/designer/creator/XEditorHolder.java  | 2 +-
 .../java/com/fr/design/mainframe/EditingMouseListener.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XEditorHolder.java b/designer-form/src/main/java/com/fr/design/designer/creator/XEditorHolder.java
index 8bcacb7d26..608eb2b27d 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XEditorHolder.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XEditorHolder.java
@@ -46,7 +46,7 @@ public class XEditorHolder extends XWidgetCreator {
 			Rectangle rect = this.getBounds();
 			int min = rect.x + rect.width / 2 - editingMouseListener.getMinMoveSize();
 			int max = rect.x + rect.width / 2 + editingMouseListener.getMinMoveSize();
-			if (e.getX() > min && e.getX() < max) {
+			if (e.getX() + editingMouseListener.getDesigner().getHorizontalScaleValue() > min && e.getX() + editingMouseListener.getDesigner().getHorizontalScaleValue() < max) {
 				ToolTipEditor.getInstance().showToolTip((XEditorHolder) this, e.getXOnScreen(),
 						e.getYOnScreen());
 			}
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 0555cf1723..62a5bc5043 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
@@ -281,7 +281,7 @@ public class EditingMouseListener extends MouseInputAdapter {
             Rectangle rect = xcreator.getBounds();
             int min = rect.x + rect.width / 2 - minMoveSize;
             int max = rect.x + rect.width / 2 + minMoveSize;
-            if (e.getX() > min && e.getX() < max) {
+            if (e.getX() + designer.getHorizontalScaleValue() > min && e.getX() + designer.getHorizontalScaleValue() < max) {
                 if (designer.getCursor().getType() != Cursor.HAND_CURSOR) {
                     designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
                 }
@@ -673,8 +673,8 @@ public class EditingMouseListener extends MouseInputAdapter {
             currentEditor = designerEditor;
             currentXCreator = creator;
             Rectangle bounds = new Rectangle(1, 1, creator.getWidth() - 2, creator.getHeight() - 2);
-            bounds.x += (rect.x - designer.getArea().getHorizontalValue());
-            bounds.y += (rect.y - designer.getArea().getVerticalValue());
+            bounds.x += (rect.x - designer.getHorizontalScaleValue());
+            bounds.y += (rect.y - designer.getVerticalScaleValue());
             designerEditor.getEditorTarget().setBounds(bounds);
             designer.add(designerEditor.getEditorTarget());
             designer.invalidate();