Merge pull request #964 from MagistrumT-T/gui-design-center-point-mar…

…k-fix

Fix `gui/design` conflicting center point behavior

changelog.txt

@@ -31,6 +31,7 @@ Template for new versions:
 ## New Features
 
 ## Fixes
+- `gui/design`: fix clicking the center point when there is a mark behind it entering both mark dragging and center dragging at the same time. Now you can click once to move the shape, and click twice to move only the mark behind the center point.
 
 ## Misc Improvements
 

gui/design.lua

@@ -1475,6 +1475,27 @@ function Design:onInput(keys)
             self.placing_mirror = false
             self.needs_update = true
         else
+            -- Clicking center point
+            if #self.marks > 0 then
+                local center = self.shape:get_center()
+                if pos == center and not self.prev_center then
+                    self.start_center = pos
+                    self.prev_center = pos
+                    return true
+                elseif self.prev_center then
+                    --If there was no movement presume user wanted to click the mark underneath instead and let the flow through.
+                    if pos == self.start_center then
+                        self.start_center = nil
+                        self.prev_center = nil
+                    else
+                    -- Since it moved let's just drop the shape here.
+                        self.start_center = nil
+                        self.prev_center = nil
+                        return true
+                    end
+                end
+            end
+
             if self.shape.basic_shape and #self.marks == self.shape.max_points then
                 -- Clicking a corner of a basic shape
                 local shape_top_left, shape_bot_right = self.shape:get_point_dims()
@@ -1514,20 +1535,6 @@ function Design:onInput(keys)
                 end
             end
 
-            -- Clicking center point
-            if #self.marks > 0 then
-                local center = self.shape:get_center()
-                if pos == center and not self.prev_center then
-                    self.start_center = pos
-                    self.prev_center = pos
-                    return true
-                elseif self.prev_center then
-                    self.start_center = nil
-                    self.prev_center = nil
-                    return true
-                end
-            end
-
             if self.mirror_point == pos then
                 self.placing_mirror = true
             end