Only drag an object if the left mouse button is above the object when…

… the button is first pressed down
CnCNet · Aug 21, 2024 · 7fd1d5c · 7fd1d5c
1 parent 1aa4857
commit 7fd1d5c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 25 deletions.
diff --git a/src/TSMapEditor/Constants.cs b/src/TSMapEditor/Constants.cs
@@ -5,7 +5,7 @@ namespace TSMapEditor
 {
     public static class Constants
     {
-        public const string ReleaseVersion = "1.1.4";
+        public const string ReleaseVersion = "1.1.5";
 
         public static int CellSizeX = 48;
         public static int CellSizeY = 24;

diff --git a/src/TSMapEditor/Rendering/MapView.cs b/src/TSMapEditor/Rendering/MapView.cs
@@ -1333,6 +1333,30 @@ public override void OnMouseOnControl()
                 }
             }
 
+            // Attempt dragging or rotating an object
+            if (CursorAction == null && tileUnderCursor != null && Cursor.LeftPressedDown && !isDraggingObject && !isRotatingObject)
+            {
+                var cellObject = tileUnderCursor.GetObject();
+
+                if (cellObject != null)
+                {
+                    draggedOrRotatedObject = tileUnderCursor.GetObject();
+
+                    if (draggedOrRotatedObject != null)
+                    {
+                        if (KeyboardCommands.Instance.RotateUnit.AreKeysDown(Keyboard))
+                            isRotatingObject = true;
+                        else
+                            isDraggingObject = true;
+                    }
+                }
+                else if (tileUnderCursor.Waypoints.Count > 0)
+                {
+                    draggedOrRotatedObject = tileUnderCursor.Waypoints[0];
+                    isDraggingObject = true;
+                }
+            }
+
             if (isRightClickScrolling)
             {
                 if (Cursor.RightDown)
@@ -1373,30 +1397,7 @@ public override void OnMouseMove()
                 }
                 else
                 {
-                    CursorAction.LeftUpOnMouseMove(tileUnderCursor == null ? new Point2D(-1, -1) : tileUnderCursor.CoordsToPoint());
-                }
-            }
-
-            if (CursorAction == null && tileUnderCursor != null && Cursor.LeftDown && !isDraggingObject && !isRotatingObject)
-            {
-                var cellObject = tileUnderCursor.GetObject();
-
-                if (cellObject != null)
-                {
-                    draggedOrRotatedObject = tileUnderCursor.GetObject();
-
-                    if (draggedOrRotatedObject != null)
-                    {
-                        if (KeyboardCommands.Instance.RotateUnit.AreKeysDown(Keyboard))
-                            isRotatingObject = true;
-                        else
-                            isDraggingObject = true;
-                    }
-                }
-                else if (tileUnderCursor.Waypoints.Count > 0)
-                {
-                    draggedOrRotatedObject = tileUnderCursor.Waypoints[0];
-                    isDraggingObject = true;
+                    CursorAction.LeftUpOnMouseMove(tileUnderCursor == null ? Point2D.NegativeOne : tileUnderCursor.CoordsToPoint());
                 }
             }