From 81bfa13576ae6aaa3b0ed6b573b5a4c12c6395f0 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 13 Aug 2020 09:58:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-37353=E3=80=90frm=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=94=AF=E6=8C=81=E7=BC=A9=E6=94=BE=E3=80=91?= =?UTF-8?q?=E7=BC=A9=E6=94=BE=E8=BF=87=E7=A8=8B=E4=B8=AD=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E8=BF=9B=E8=A1=8C=E5=9B=BE=E8=A1=A8=E7=BC=96=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E6=8B=96=E5=8A=A8=E6=BB=9A=E5=8A=A8=E6=9D=A1=EF=BC=8C?= =?UTF-8?q?=E5=B0=B1=E4=BC=9A=E9=87=8D=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/EditingMouseListener.java | 4 ++-- .../main/java/com/fr/design/mainframe/FormDesignerUI.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 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 d325e56e4..0f3af7537 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 @@ -685,8 +685,8 @@ public class EditingMouseListener extends MouseInputAdapter { Rectangle rect = ComponentUtils.getRelativeBounds(currentXCreator); Rectangle bounds = new Rectangle(1, 1, currentXCreator.getWidth() - 2, currentXCreator.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()); if (currentXCreator instanceof XEditorHolder) { ToolTipEditor.getInstance().resetBounds((XEditorHolder) currentXCreator, bounds, currentEditor.getEditorTarget().getBounds()); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java index 404a0fd13..3767ccd87 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java @@ -177,13 +177,13 @@ public class FormDesignerUI extends ComponentUI { if (k == 1 || k == 2) { x1 = 0; x2 = 6; - y2 = y1 = bounds.y - designer.getArea().getVerticalValue() + (k == 1 ? 0 : bounds.height); - text = Utils.objectToString(y1 + designer.getArea().getVerticalValue()); + y2 = y1 = bounds.y - designer.getVerticalScaleValue() + (k == 1 ? 0 : bounds.height); + text = Utils.objectToString(bounds.y); } else { y1 = 0; y2 = 6; - x1 = x2 = bounds.x - designer.getArea().getHorizontalValue() + (k == 3 ? 0 : bounds.width); - text = Utils.objectToString(x1 + designer.getArea().getHorizontalValue()); + x1 = x2 = bounds.x - designer.getHorizontalScaleValue()+ (k == 3 ? 0 : bounds.width); + text = Utils.objectToString(bounds.x); } text += com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel"); g2d.setColor(XCreatorConstants.RESIZE_BOX_BORDER_COLOR); From 44339dd3815a820690c6eebb8e72d28892ae6260 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 13 Aug 2020 10:19:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/FormDesignerUI.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java index 3767ccd87..68ea5c2b8 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java @@ -409,8 +409,8 @@ public class FormDesignerUI extends ComponentUI { clipg = g.create( -designer.getHorizontalScaleValue(), -designer.getVerticalScaleValue() + designer.getParaHeight(), - parent.getSize().width + designer.getArea().getHorizontalValue(), - parent.getSize().height + designer.getArea().getVerticalValue()); + (int) ((parent.getSize().width + designer.getArea().getHorizontalValue()) / designer.getScale()), + (int) ((parent.getSize().height + designer.getArea().getVerticalValue()) / designer.getScale())); designer.paintContent(clipg); paintWatermark((Graphics2D) clipg); @@ -435,8 +435,8 @@ public class FormDesignerUI extends ComponentUI { Graphics clipg1; clipg1 = g.create(-designer.getHorizontalScaleValue(), -designer.getVerticalScaleValue(), - parent.getSize().width + designer.getArea().getHorizontalValue(), - designer.getParaHeight() + designer.getArea().getVerticalValue()); + (int) ((parent.getSize().width + designer.getArea().getHorizontalValue()) / designer.getScale()), + (int) ((designer.getParaHeight() + designer.getArea().getVerticalValue()) / designer.getScale())); designer.paintPara(clipg1); clipg1.dispose();