Pull request #2188: REPORT-38272 && REPORT-38287 && REPORT-37922【frm设计界面支持缩放】参数面板控件如果进行较大的缩放幅度，会遮挡部分

Merge in DESIGN/design from ~KERRY/design_10.0:final/10.0 to final/10.0

* commit '2433240bce61db3c66b56a4b96e69dee4b4aa54f':
  REPORT-38272 && REPORT-38287 && REPORT-37922【frm设计界面支持缩放】参数面板控件如果进行较大的缩放幅度，会遮挡部分

designer-form/src/main/java/com/fr/design/designer/beans/models/AddingModel.java

@@ -133,13 +133,13 @@ public class AddingModel {
         Rectangle rect = ComponentUtils.getRelativeBounds(container);
         if (!ComparatorUtils.equals(container.getOuterLayout(), container.getBackupParent())) {
             added = container.getLayoutAdapter().addBean(creator,
-                    x + designer.getArea().getHorizontalValue(),
-                    y + designer.getArea().getVerticalValue());
+                    x + designer.getHorizontalScaleValue(),
+                    y + designer.getVerticalScaleValue() );
             return added;
         }
         added = container.getLayoutAdapter().addBean(creator,
-                x + designer.getArea().getHorizontalValue() - rect.x,
-                y + designer.getArea().getVerticalValue() - rect.y);
+                x + designer.getHorizontalScaleValue() - rect.x,
+                y + designer.getVerticalScaleValue() - rect.y);
         return added;
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

@@ -11,7 +11,13 @@ import com.fr.design.designer.beans.location.Direction;
 import com.fr.design.designer.beans.location.Location;
 import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.beans.models.StateModel;
-import com.fr.design.designer.creator.*;
+import com.fr.design.designer.creator.XChartEditor;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.XEditorHolder;
+import com.fr.design.designer.creator.XElementCase;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.cardlayout.XCardSwitchButton;
 import com.fr.design.designer.creator.cardlayout.XWCardLayout;
 import com.fr.design.form.util.XCreatorConstants;
@@ -22,14 +28,20 @@ import com.fr.design.icon.IconPathConstants;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.LayoutUtils;
-
 import com.fr.share.ShareConstants;
 import com.fr.stable.Constants;
-
 import com.fr.stable.StringUtils;
-import javax.swing.*;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPopupMenu;
+import javax.swing.JWindow;
+import javax.swing.SwingUtilities;
 import javax.swing.event.MouseInputAdapter;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 
 /**
@@ -165,10 +177,13 @@ public class EditingMouseListener extends MouseInputAdapter {
                 if (designer.isDrawLineMode()) {
                     designer.updateDrawLineMode(e);
                 } else {
+                    int relativeX = Math.max(0, designer.getRelativeX(e.getX()));
+                    int relativeY = Math.max(0, designer.getRelativeY(e.getY()));
+
                     if (selectionModel.hasSelectionComponent()
                             && selectionModel.getSelection().getRelativeBounds().contains(
-                            designer.getArea().getHorizontalValue() + e.getX(),
-                            designer.getArea().getVerticalValue() + e.getY())) {
+                            designer.getHorizontalScaleValue() + relativeX,
+                            designer.getVerticalScaleValue() + relativeY)) {
                         lastPressEvent = e;
                         lastXCreator = selectionModel.getSelection().getSelectedCreator();
                     } else {

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(),
-                (int) ((parent.getSize().width + designer.getArea().getHorizontalValue()) / designer.getScale()),
-                (int) ((parent.getSize().height + designer.getArea().getVerticalValue()) / designer.getScale()));
+                parent.getSize().width + designer.getHorizontalScaleValue(),
+                parent.getSize().height + designer.getVerticalScaleValue());
 
         designer.paintContent(clipg);
         paintWatermark((Graphics2D) clipg);
@@ -435,8 +435,8 @@ public class FormDesignerUI extends ComponentUI {
         Graphics clipg1;
         clipg1 = g.create(-designer.getHorizontalScaleValue(),
                 -designer.getVerticalScaleValue(),
-                (int) ((parent.getSize().width + designer.getArea().getHorizontalValue()) / designer.getScale()),
-                (int) ((designer.getParaHeight() + designer.getArea().getVerticalValue()) / designer.getScale()));
+                parent.getSize().width + designer.getHorizontalScaleValue(),
+               designer.getParaHeight() + designer.getVerticalScaleValue());
 
         designer.paintPara(clipg1);
         clipg1.dispose();