Merge pull request #29 from RuntimeRascal/copilot/fix-eraser-tool-functionality

Fix eraser tool for rectangles/circles + add shift modifier for perfect squares

Author: RuntimeRascal

CHANGELOG.md

@@ -6,6 +6,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## v1.0.11
+
+### Added
+- **Rectangle Tool: Shift Modifier for Perfect Squares**
+  - Hold Shift while drawing rectangles to constrain to perfect squares
+  - Uses `Math.Min(width, height)` to fit square within dragged bounds
+  - Works during both preview and finalization
+  - Consistent with Circle tool's Shift modifier behavior
+
+### Fixed
+- **Eraser Tool Now Erases All Shape Types**
+  - Eraser now properly removes Rectangle shapes
+  - Eraser now properly removes Circle/Ellipse shapes
+  - Added bounds intersection detection using `IntersectsWith()` for shape types
+  - Added NaN guards for `Canvas.GetLeft/GetTop` to handle uninitialized attached properties
+  - Previously only removed Polylines (pen strokes) and Lines
+
 ## v1.0.10
 
 ### Added

Installer/GhostDraw.Installer.wixproj

@@ -1,6 +1,6 @@
 <Project Sdk="WixToolset.Sdk/4.0.5">
   <PropertyGroup>
-    <Version Condition="'$(Version)' == ''">1.0.10</Version>
+    <Version Condition="'$(Version)' == ''">1.0.11</Version>
     <OutputName>GhostDrawSetup-$(Version)</OutputName>
     <OutputType>Package</OutputType>
     <Platform>x64</Platform>

Src/GhostDraw/GhostDraw.csproj

@@ -8,7 +8,7 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>Assets\favicon.ico</ApplicationIcon>
-    <Version>1.0.10</Version>
+    <Version>1.0.11</Version>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 

Src/GhostDraw/Tools/EraserTool.cs

@@ -136,6 +136,42 @@ private void EraseAtPosition(Point position, Canvas canvas)
                         }
                     }
                 }
+                else if (element is System.Windows.Shapes.Rectangle rectangle)
+                {
+                    // Check if eraser intersects with rectangle bounds
+                    double left = Canvas.GetLeft(rectangle);
+                    double top = Canvas.GetTop(rectangle);
+                    
+                    // Handle NaN values (shouldn't happen, but be defensive)
+                    if (!double.IsNaN(left) && !double.IsNaN(top) && 
+                        !double.IsNaN(rectangle.Width) && !double.IsNaN(rectangle.Height))
+                    {
+                        Rect shapeRect = new Rect(left, top, rectangle.Width, rectangle.Height);
+                        
+                        if (eraserRect.IntersectsWith(shapeRect))
+                        {
+                            shouldErase = true;
+                        }
+                    }
+                }
+                else if (element is Ellipse ellipse)
+                {
+                    // Check if eraser intersects with ellipse bounds
+                    double left = Canvas.GetLeft(ellipse);
+                    double top = Canvas.GetTop(ellipse);
+                    
+                    // Handle NaN values (shouldn't happen, but be defensive)
+                    if (!double.IsNaN(left) && !double.IsNaN(top) && 
+                        !double.IsNaN(ellipse.Width) && !double.IsNaN(ellipse.Height))
+                    {
+                        Rect ellipseRect = new Rect(left, top, ellipse.Width, ellipse.Height);
+                        
+                        if (eraserRect.IntersectsWith(ellipseRect))
+                        {
+                            shouldErase = true;
+                        }
+                    }
+                }
 
                 if (shouldErase)
                 {

Src/GhostDraw/Tools/RectangleTool.cs

@@ -42,7 +42,9 @@ public void OnMouseMove(Point position, Canvas canvas, MouseButtonState leftButt
         if (_isCreatingRectangle && _currentRectangle != null && _rectangleStartPoint.HasValue)
         {
             // Update rectangle dimensions to follow cursor
-            UpdateRectangle(_rectangleStartPoint.Value, position);
+            // Check if Shift key is held down for perfect square
+            bool isShiftPressed = Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift);
+            UpdateRectangle(_rectangleStartPoint.Value, position, isShiftPressed);
         }
     }
 
@@ -117,7 +119,7 @@ private void StartNewRectangle(Point startPoint, Canvas canvas)
         _logger.LogInformation("Rectangle started at ({X:F0}, {Y:F0})", startPoint.X, startPoint.Y);
     }
 
-    private void UpdateRectangle(Point startPoint, Point currentPoint)
+    private void UpdateRectangle(Point startPoint, Point currentPoint, bool isPerfectSquare = false)
     {
         if (_currentRectangle == null)
             return;
@@ -128,6 +130,17 @@ private void UpdateRectangle(Point startPoint, Point currentPoint)
         double width = Math.Abs(currentPoint.X - startPoint.X);
         double height = Math.Abs(currentPoint.Y - startPoint.Y);
 
+        // If Shift is held, make it a perfect square (width = height = min dimension)
+        // Note: Uses Math.Min (not Math.Max like CircleTool) so the square fits within
+        // the dragged bounding box, making the final size more predictable and visible
+        // to the user as they drag. This matches the behavior specified in the issue.
+        if (isPerfectSquare)
+        {
+            double size = Math.Min(width, height);
+            width = size;
+            height = size;
+        }
+
         Canvas.SetLeft(_currentRectangle, left);
         Canvas.SetTop(_currentRectangle, top);
         _currentRectangle.Width = width;
@@ -138,7 +151,9 @@ private void FinishRectangle(Point endPoint)
     {
         if (_currentRectangle != null && _rectangleStartPoint.HasValue)
         {
-            UpdateRectangle(_rectangleStartPoint.Value, endPoint);
+            // Check if Shift was held on the final click
+            bool isShiftPressed = Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift);
+            UpdateRectangle(_rectangleStartPoint.Value, endPoint, isShiftPressed);
             _logger.LogInformation("Rectangle finished at ({X:F0}, {Y:F0})", endPoint.X, endPoint.Y);
         }
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "ghost-draw",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "description": "Draw directly on your screen with a transparent overlay",
     "repository": {
         "type": "git",