Revert "其他- 多选移动逻辑优化"

This reverts commit b6fa3536cdb40f0083d6388a08a923495bee0712.

Demo/Examples/ComPDFKit.Tool/CPDFToolManager.cs

@@ -559,21 +559,19 @@ namespace ComPDFKit.Tool
                         if ((float)point.X == 0)
                         {
                             cRect.left += (float)point.X;
-                            cRect.right = cRect.left + (cRect.right - cRect.left) + (float)DpiHelper.StandardNumToPDFNum(e.ChangeX)  / zoom;
+                            cRect.right = cRect.left + (cRect.right - cRect.left) * e.ZoomX;
                         }
-                        else
-                        {
-
+                        else {
+                            
                             cRect.left += (float)point.X;
                         }
                         if ((float)point.Y == 0)
                         {
                             cRect.top += (float)point.Y;
-                            cRect.bottom = cRect.top + (cRect.bottom - cRect.top) + (float)DpiHelper.StandardNumToPDFNum(e.ChangeY) / zoom;
+                            cRect.bottom = cRect.top + (cRect.bottom - cRect.top) * e.ZoomY;
                         }
-                        else
-                        {
-
+                        else {
+                            
                             cRect.top += (float)point.Y;
                         }
                     }
@@ -1919,7 +1917,7 @@ namespace ComPDFKit.Tool
                         if (multiSelectedRect == null || multiSelectedRect.Children.Count == 0)
                         {
                             //Selection of mobile drawing logic
-                            if (e.mouseButtonEventArgs.LeftButton == MouseButtonState.Pressed && createContentEditType == CPDFEditType.None)
+                            if (e.mouseButtonEventArgs.LeftButton == MouseButtonState.Pressed&& createContentEditType == CPDFEditType.None)
                             {
                                 viewerTool.DrawMoveFrameSelect();
                             }

Demo/Examples/ComPDFKit.Tool/CPDFViewerTool.MultiSelectedRect.cs

@@ -27,10 +27,6 @@ namespace ComPDFKit.Tool
         public float ZoomX { get; set; }
 
         public float ZoomY { get; set; }
-
-        public float ChangeX { get; set; }
-
-        public float ChangeY { get; set; }
     }
 
     public partial class CPDFViewerTool
@@ -66,8 +62,6 @@ namespace ComPDFKit.Tool
             {
                 multiSelectedAnnotData.ZoomX = multiSelectedRect.GetZoomX();
                 multiSelectedAnnotData.ZoomY = multiSelectedRect.GetZoomY();
-                multiSelectedAnnotData.ChangeX = multiSelectedRect.GetChangeX();
-                multiSelectedAnnotData.ChangeY = multiSelectedRect.GetChangeY();
                 multiSelectedAnnotData.MoveOffset = e;
                 multiSelectedAnnotData.ObjectType = multiSelectedRect.GetSelectedType();
                 multiSelectedAnnotData.MultiObjectIndex = new List<int>();
@@ -85,8 +79,6 @@ namespace ComPDFKit.Tool
             {
                 multiSelectedAnnotData.ZoomX = multiSelectedRect.GetZoomX();
                 multiSelectedAnnotData.ZoomY = multiSelectedRect.GetZoomY();
-                multiSelectedAnnotData.ChangeX = multiSelectedRect.GetChangeX();
-                multiSelectedAnnotData.ChangeY = multiSelectedRect.GetChangeY();
                 multiSelectedAnnotData.MoveOffset = e;
                 multiSelectedAnnotData.ObjectType = multiSelectedRect.GetSelectedType();
                 multiSelectedAnnotData.MultiObjectIndex = new List<int>();

Demo/Examples/ComPDFKit.Tool/DrawTool/MultiSelectedRect.cs

@@ -339,16 +339,6 @@ namespace ComPDFKit.Tool.DrawTool
             return (float)(drawRect.Height / drawDefaultRect.Height);
         }
 
-        public float GetChangeX()
-        {
-            return (float)(drawRect.Width - drawDefaultRect.Width);
-        }
-
-        public float GetChangeY()
-        {
-            return (float)(drawRect.Height - drawDefaultRect.Height);
-        }
-
         public void Draw()
         {
             switch (currentDrawType)