From e35913ef167a692e34891737a7dd524449aaf480 Mon Sep 17 00:00:00 2001
From: momeak <fr123456>
Date: Thu, 14 Sep 2017 15:44:05 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4450=20=E8=81=9A=E5=90=88=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=9C=A8=E7=BC=A9=E6=94=BE=E5=90=8E=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9D=97=EF=BC=8C=E4=BC=9A=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E9=94=99=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/poly/PolyDesigner.java               | 3 +--
 designer/src/com/fr/poly/PolyUtils.java                  | 9 +++++----
 .../com/fr/poly/hanlder/BottomCornerMouseHanlder.java    | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java
index 09d0f8f659..c8cc3362fc 100644
--- a/designer/src/com/fr/poly/PolyDesigner.java
+++ b/designer/src/com/fr/poly/PolyDesigner.java
@@ -272,7 +272,6 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
         this.time = (float) resolution / ScreenResolution.getScreenResolution();
         resetEditorComponentBounds();
-        LayoutUtils.layoutRootContainer(this);
         g.setColor(Color.black);
         GraphHelper.drawLine(g, 0, 0, this.getWidth(), 0);
         GraphHelper.drawLine(g, 0, 0, 0, this.getHeight());
@@ -281,7 +280,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     private void resetEditorComponentBounds() {
         if (selection != null) {
-            selection.setResolution(this.resolution);
+            selection.setResolution(ScreenResolution.getScreenResolution());
             selection.getEditor().setBounds((int) (selection.getEditorBounds().x * time), (int) (selection.getEditorBounds().y * time),
                     (int) (selection.getEditorBounds().width * time), (int) (selection.getEditorBounds().height * time));
             LayoutUtils.layoutRootContainer(this);
diff --git a/designer/src/com/fr/poly/PolyUtils.java b/designer/src/com/fr/poly/PolyUtils.java
index d9c54b2fac..a0d13a0429 100644
--- a/designer/src/com/fr/poly/PolyUtils.java
+++ b/designer/src/com/fr/poly/PolyUtils.java
@@ -115,10 +115,11 @@ public class PolyUtils {
 		AddedData addedData = designer.getAddedData();
 		for (int count = addedData.getAddedCount() - 1; count >= 0; count--) {
 			BlockCreator creator = addedData.getAddedAt(count);
-			int cx = creator.getX();
-			int cy = creator.getY();
-			int cw = creator.getWidth();
-			int ch = creator.getHeight();
+			float times = (float) designer.getResolution()/ScreenResolution.getScreenResolution();
+			int cx = (int) (creator.getX() * times);
+			int cy = (int) (creator.getY() * times);
+			int cw = (int) (creator.getWidth() * times);
+			int ch = (int) (creator.getHeight() * times);
 			if (x >= cx && x <= (cx + cw)) {
 				if(y >= cy && y <= (cy + ch)) {
 					return creator;
diff --git a/designer/src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java b/designer/src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java
index 3f063e21d4..84a626406b 100644
--- a/designer/src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java
+++ b/designer/src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java
@@ -15,6 +15,7 @@ import com.fr.design.beans.location.Absorptionline;
 import com.fr.design.beans.location.MoveUtils;
 import com.fr.design.beans.location.MoveUtils.RectangleDesigner;
 import com.fr.design.beans.location.MoveUtils.RectangleIterator;
+import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.poly.PolyDesigner;
 import com.fr.poly.PolyDesigner.SelectionType;
@@ -101,6 +102,7 @@ public class BottomCornerMouseHanlder extends MouseInputAdapter {
 		dragStart.y -= pressed.y;
 		TemplateBlock block = editor.getValue();
 
+		resolution = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getJTemplateResolution();
 		Rectangle bounds = block.getBounds().toRectangle(resolution);
 		Point resultPoint = MoveUtils.sorption(bounds.x + dragStart.x < 0 ? 0 : bounds.x + dragStart.x, bounds.y
 				+ dragStart.y < 0 ? 0 : bounds.y + dragStart.y, bounds.width, bounds.height, rectDesigner, false);