From f9d02017115411c3c7dfcd2b90884dce47e2ef66 Mon Sep 17 00:00:00 2001 From: obo Date: Fri, 14 Jul 2023 10:18:59 +0800 Subject: [PATCH 1/8] =?UTF-8?q?REPORT-99924=20FR10=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=88=B011=E5=90=8E=EF=BC=8C=E5=AF=BC=E5=87=BA=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=AD=97=E4=BD=93=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/report/ImageExportPane.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java b/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java index 08d1a213c3..ba4eccb63a 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java @@ -84,20 +84,20 @@ public class ImageExportPane extends AbstractExportPane { private void initGlobalSettings() { - globalResolutionBtnS = new UIRadioButton("96dpi", true); - globalResolutionBtnM = new UIRadioButton("192dpi"); + globalResolutionBtnS = new UIRadioButton("96dpi"); + globalResolutionBtnM = new UIRadioButton("192dpi", true); globalResolutionBtnL = new UIRadioButton("300dpi"); wrapButtonsInButtonGroup(globalResolutionBtnS, globalResolutionBtnM, globalResolutionBtnL); - globalFormatJpg = new UIRadioButton("jpg", true); - globalFormatPng = new UIRadioButton("png"); + globalFormatJpg = new UIRadioButton("jpg"); + globalFormatPng = new UIRadioButton("png", true); wrapButtonsInButtonGroup(globalFormatJpg, globalFormatPng); - globalRenderQuality = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Quality_First"), true); - globalRenderSpeed = new UIRadioButton(Toolkit.i18nText(("Fine-Design_Image_Export_Speed_Priority"))); + globalRenderQuality = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Quality_First")); + globalRenderSpeed = new UIRadioButton(Toolkit.i18nText(("Fine-Design_Image_Export_Speed_Priority")), true); wrapButtonsInButtonGroup(globalRenderQuality, globalRenderSpeed); - templateThumbnail = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Thumbnail")); + templateThumbnail = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Thumbnail"), true); templatePaging = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Paging")); wrapButtonsInButtonGroup(templateThumbnail, templatePaging); } From 5aad600fee1278e9e90b38e239a69085a07877a9 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 19 Jul 2023 10:15:26 +0800 Subject: [PATCH 2/8] =?UTF-8?q?REPORT-100623=20=E6=8E=A7=E4=BB=B6-?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E6=A0=B9=E6=8D=AE=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E7=9A=84=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=94=BE=E5=A4=A7=E5=90=8E?= =?UTF-8?q?=E6=97=A0=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(); From f2d954c2874bbf9b5fd8520edb8049336b1773a7 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 19 Jul 2023 10:17:50 +0800 Subject: [PATCH 3/8] =?UTF-8?q?REPORT-99924=20=E6=8F=90=E5=88=B0bugfix?= =?UTF-8?q?=E4=BA=86,=E5=9B=9E=E9=80=80=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/report/ImageExportPane.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java b/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java index ba4eccb63a..b3c46d5c60 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java @@ -84,21 +84,20 @@ public class ImageExportPane extends AbstractExportPane { private void initGlobalSettings() { - globalResolutionBtnS = new UIRadioButton("96dpi"); - globalResolutionBtnM = new UIRadioButton("192dpi", true); + globalResolutionBtnS = new UIRadioButton("96dpi", true); + globalResolutionBtnM = new UIRadioButton("192dpi"); globalResolutionBtnL = new UIRadioButton("300dpi"); wrapButtonsInButtonGroup(globalResolutionBtnS, globalResolutionBtnM, globalResolutionBtnL); - globalFormatJpg = new UIRadioButton("jpg"); - globalFormatPng = new UIRadioButton("png", true); + globalFormatJpg = new UIRadioButton("jpg", true); + globalFormatPng = new UIRadioButton("png"); wrapButtonsInButtonGroup(globalFormatJpg, globalFormatPng); - globalRenderQuality = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Quality_First")); - globalRenderSpeed = new UIRadioButton(Toolkit.i18nText(("Fine-Design_Image_Export_Speed_Priority")), true); + globalRenderQuality = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Quality_First"), true); + globalRenderSpeed = new UIRadioButton(Toolkit.i18nText(("Fine-Design_Image_Export_Speed_Priority"))); wrapButtonsInButtonGroup(globalRenderQuality, globalRenderSpeed); - templateThumbnail = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Thumbnail"), true); - templatePaging = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Paging")); + templateThumbnail = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Thumbnail")); wrapButtonsInButtonGroup(templateThumbnail, templatePaging); } From 83f9acc28dd15f513c3f1b9bdb17d009599c24e4 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 19 Jul 2023 10:18:25 +0800 Subject: [PATCH 4/8] =?UTF-8?q?REPORT-99924=20=E6=8F=90=E5=88=B0bugfix?= =?UTF-8?q?=E4=BA=86,=E5=9B=9E=E9=80=80=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/report/ImageExportPane.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java b/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java index b3c46d5c60..08d1a213c3 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java @@ -98,6 +98,7 @@ public class ImageExportPane extends AbstractExportPane { wrapButtonsInButtonGroup(globalRenderQuality, globalRenderSpeed); templateThumbnail = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Thumbnail")); + templatePaging = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Paging")); wrapButtonsInButtonGroup(templateThumbnail, templatePaging); } From 47fcbc203159d6540815ccc2e18950d872ab8db4 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 19 Jul 2023 11:10:13 +0800 Subject: [PATCH 5/8] =?UTF-8?q?REPORT-100623=20=E8=A1=A5=E5=85=85=E4=B8=8A?= =?UTF-8?q?=E7=AB=96=E7=9B=B4=E6=96=B9=E5=90=91=E7=9A=84=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/creator/XEditorHolder.java | 22 ++++++++++++++++--- .../mainframe/EditingMouseListener.java | 15 ++++++++++--- 2 files changed, 31 insertions(+), 6 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 608eb2b27d..1889172c69 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 @@ -44,9 +44,7 @@ public class XEditorHolder extends XWidgetCreator { ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this); editingMouseListener.startEditing(this, adapter.getDesignerEditor(), adapter); 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() + editingMouseListener.getDesigner().getHorizontalScaleValue() > min && e.getX() + editingMouseListener.getDesigner().getHorizontalScaleValue() < max) { + if (MouseEditRangeValid(e, rect, editingMouseListener)) { ToolTipEditor.getInstance().showToolTip((XEditorHolder) this, e.getXOnScreen(), e.getYOnScreen()); } @@ -54,6 +52,24 @@ public class XEditorHolder extends XWidgetCreator { } } + /** + * 判断当前鼠标事件是否在可编辑区域内 + * + * @param e 鼠标事件 + * @param rect 区域 + * @param editingMouseListener 位置处理器 + * @return 是否位于可编辑区 + */ + private boolean MouseEditRangeValid(MouseEvent e, Rectangle rect, EditingMouseListener editingMouseListener) { + int minHorizontal = rect.x + rect.width / 2 - editingMouseListener.getMinMoveSize(); + int maxHorizontal = rect.x + rect.width / 2 + editingMouseListener.getMinMoveSize(); + int minVertical = rect.y + rect.height / 2 - editingMouseListener.getMinMoveSize(); + int maxVertical = rect.y + rect.height / 2 + editingMouseListener.getMinMoveSize(); + + return e.getX() + editingMouseListener.getDesigner().getHorizontalScaleValue() > minHorizontal && e.getX() + editingMouseListener.getDesigner().getHorizontalScaleValue() < maxHorizontal + && e.getY() + editingMouseListener.getDesigner().getVerticalScaleValue() > minVertical && e.getY() + editingMouseListener.getDesigner().getVerticalScaleValue() < maxVertical; + } + @Override protected String getIconName() { return "text_field_16.png"; 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 62a5bc5043..64b07d50ce 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 @@ -279,9 +279,7 @@ public class EditingMouseListener extends MouseInputAdapter { if (component instanceof XEditorHolder) { XEditorHolder xcreator = (XEditorHolder) component; Rectangle rect = xcreator.getBounds(); - int min = rect.x + rect.width / 2 - minMoveSize; - int max = rect.x + rect.width / 2 + minMoveSize; - if (e.getX() + designer.getHorizontalScaleValue() > min && e.getX() + designer.getHorizontalScaleValue() < max) { + if (creatorRangeValid(e, rect)) { if (designer.getCursor().getType() != Cursor.HAND_CURSOR) { designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } @@ -747,4 +745,15 @@ public class EditingMouseListener extends MouseInputAdapter { refreshTopXCreator(false); } + /** + * 判断当前鼠标移动事件是否在Creator有效范围内 + */ + private boolean creatorRangeValid(MouseEvent e, Rectangle rect) { + int minHorizontal = rect.x + rect.width / 2 - minMoveSize; + int maxHorizontal = rect.x + rect.width / 2 + minMoveSize; + int minVertical = rect.y + rect.height / 2 - minMoveSize; + int maxVertical = rect.y + rect.height / 2 + minMoveSize; + return e.getX() + designer.getHorizontalScaleValue() > minHorizontal && e.getX() + designer.getHorizontalScaleValue() < maxHorizontal + && e.getY() + designer.getVerticalScaleValue() > minVertical && e.getY() + designer.getVerticalScaleValue() < maxVertical; + } } From 6d968323de89d6d30c9665f4b4126080c0bd8539 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 19 Jul 2023 11:24:00 +0800 Subject: [PATCH 6/8] =?UTF-8?q?REPORT-100623=20=E8=8E=B7=E5=8F=96rootConta?= =?UTF-8?q?iner=E6=97=B6=E5=8A=A0=E4=B8=8A=E7=AB=96=E7=9B=B4=E6=96=B9?= =?UTF-8?q?=E5=90=91=E7=9A=84=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/FormDesigner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java index 24ed004fff..87f7465490 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java @@ -1208,7 +1208,7 @@ public class FormDesigner extends TargetComponent
implements TreeSelection } public XLayoutContainer getRootContainer(int y) { - XLayoutContainer container = y < paraHeight - formArea.getVerticalValue() ? paraComponent : rootComponent; + XLayoutContainer container = y < paraHeight - formArea.getVerticalValue() / scale ? paraComponent : rootComponent; if (container == null) { container = rootComponent; } From b7eb17ae624ae3b00f79ffcf97be4b2da2f59d58 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 19 Jul 2023 11:26:47 +0800 Subject: [PATCH 7/8] =?UTF-8?q?REPORT-100623=20=E6=96=B9=E6=B3=95=E5=90=8D?= =?UTF-8?q?=E5=86=99=E6=88=90=E5=A4=A7=E5=86=99=E5=AD=97=E6=AF=8D=E5=BC=80?= =?UTF-8?q?=E5=A4=B4=E4=BA=86=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/designer/creator/XEditorHolder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 1889172c69..d523010bf8 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 @@ -44,7 +44,7 @@ public class XEditorHolder extends XWidgetCreator { ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this); editingMouseListener.startEditing(this, adapter.getDesignerEditor(), adapter); Rectangle rect = this.getBounds(); - if (MouseEditRangeValid(e, rect, editingMouseListener)) { + if (mouseEditRangeValid(e, rect, editingMouseListener)) { ToolTipEditor.getInstance().showToolTip((XEditorHolder) this, e.getXOnScreen(), e.getYOnScreen()); } @@ -60,7 +60,7 @@ public class XEditorHolder extends XWidgetCreator { * @param editingMouseListener 位置处理器 * @return 是否位于可编辑区 */ - private boolean MouseEditRangeValid(MouseEvent e, Rectangle rect, EditingMouseListener editingMouseListener) { + private boolean mouseEditRangeValid(MouseEvent e, Rectangle rect, EditingMouseListener editingMouseListener) { int minHorizontal = rect.x + rect.width / 2 - editingMouseListener.getMinMoveSize(); int maxHorizontal = rect.x + rect.width / 2 + editingMouseListener.getMinMoveSize(); int minVertical = rect.y + rect.height / 2 - editingMouseListener.getMinMoveSize(); From a28fc37a8a382702be7150da78965d04c6e73e06 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 19 Jul 2023 15:52:23 +0800 Subject: [PATCH 8/8] =?UTF-8?q?REPORT-100623=20=E4=BC=98=E5=8C=96=E4=B8=8B?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/creator/XEditorHolder.java | 23 +++++++++++-------- .../mainframe/EditingMouseListener.java | 20 +++++++++------- 2 files changed, 26 insertions(+), 17 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 d523010bf8..3291159a3a 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 @@ -44,7 +44,7 @@ public class XEditorHolder extends XWidgetCreator { ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this); editingMouseListener.startEditing(this, adapter.getDesignerEditor(), adapter); Rectangle rect = this.getBounds(); - if (mouseEditRangeValid(e, rect, editingMouseListener)) { + if (checkMouseEditRangeValid(e, rect, editingMouseListener)) { ToolTipEditor.getInstance().showToolTip((XEditorHolder) this, e.getXOnScreen(), e.getYOnScreen()); } @@ -60,14 +60,19 @@ public class XEditorHolder extends XWidgetCreator { * @param editingMouseListener 位置处理器 * @return 是否位于可编辑区 */ - private boolean mouseEditRangeValid(MouseEvent e, Rectangle rect, EditingMouseListener editingMouseListener) { - int minHorizontal = rect.x + rect.width / 2 - editingMouseListener.getMinMoveSize(); - int maxHorizontal = rect.x + rect.width / 2 + editingMouseListener.getMinMoveSize(); - int minVertical = rect.y + rect.height / 2 - editingMouseListener.getMinMoveSize(); - int maxVertical = rect.y + rect.height / 2 + editingMouseListener.getMinMoveSize(); - - return e.getX() + editingMouseListener.getDesigner().getHorizontalScaleValue() > minHorizontal && e.getX() + editingMouseListener.getDesigner().getHorizontalScaleValue() < maxHorizontal - && e.getY() + editingMouseListener.getDesigner().getVerticalScaleValue() > minVertical && e.getY() + editingMouseListener.getDesigner().getVerticalScaleValue() < maxVertical; + private boolean checkMouseEditRangeValid(MouseEvent e, Rectangle rect, EditingMouseListener editingMouseListener) { + int horizontalValue = editingMouseListener.getDesigner().getHorizontalScaleValue(); + int verticalValue = editingMouseListener.getDesigner().getVerticalScaleValue(); + int minMoveSize = editingMouseListener.getMinMoveSize(); + + int minHorizontal = rect.x + rect.width / 2 - minMoveSize - horizontalValue; + int maxHorizontal = rect.x + rect.width / 2 + minMoveSize - horizontalValue; + int minVertical = rect.y + rect.height / 2 - minMoveSize - verticalValue; + int maxVertical = rect.y + rect.height / 2 + minMoveSize - verticalValue; + boolean xRangeValid = e.getX() > minHorizontal && e.getX() < maxHorizontal; + boolean yRangeValid = e.getY() > minVertical && e.getY() < maxVertical; + + return xRangeValid && yRangeValid; } @Override 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 64b07d50ce..801a342197 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 @@ -279,7 +279,7 @@ public class EditingMouseListener extends MouseInputAdapter { if (component instanceof XEditorHolder) { XEditorHolder xcreator = (XEditorHolder) component; Rectangle rect = xcreator.getBounds(); - if (creatorRangeValid(e, rect)) { + if (checkCreatorRangeValid(e, rect)) { if (designer.getCursor().getType() != Cursor.HAND_CURSOR) { designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } @@ -748,12 +748,16 @@ public class EditingMouseListener extends MouseInputAdapter { /** * 判断当前鼠标移动事件是否在Creator有效范围内 */ - private boolean creatorRangeValid(MouseEvent e, Rectangle rect) { - int minHorizontal = rect.x + rect.width / 2 - minMoveSize; - int maxHorizontal = rect.x + rect.width / 2 + minMoveSize; - int minVertical = rect.y + rect.height / 2 - minMoveSize; - int maxVertical = rect.y + rect.height / 2 + minMoveSize; - return e.getX() + designer.getHorizontalScaleValue() > minHorizontal && e.getX() + designer.getHorizontalScaleValue() < maxHorizontal - && e.getY() + designer.getVerticalScaleValue() > minVertical && e.getY() + designer.getVerticalScaleValue() < maxVertical; + private boolean checkCreatorRangeValid(MouseEvent e, Rectangle rect) { + int horizontalValue = designer.getHorizontalScaleValue(); + int verticalValue = designer.getVerticalScaleValue(); + + int minHorizontal = rect.x + rect.width / 2 - minMoveSize - horizontalValue; + int maxHorizontal = rect.x + rect.width / 2 + minMoveSize - horizontalValue; + int minVertical = rect.y + rect.height / 2 - minMoveSize - verticalValue; + int maxVertical = rect.y + rect.height / 2 + minMoveSize - verticalValue; + boolean xRangeValid = e.getX() > minHorizontal && e.getX() < maxHorizontal; + boolean yRangeValid = e.getY() > minVertical && e.getY() < maxVertical; + return xRangeValid && yRangeValid; } }