Merge pull request #23 from RuntimeRascal/copilot/add-rectangle-drawing-tool

Add Rectangle drawing tool with U key shortcut

Author: RuntimeRascal

CHANGELOG.md

@@ -6,6 +6,18 @@ 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.8
+
+### Added
+- **Rectangle Tool** - Draw rectangles by clicking two points
+  - Press `U` to activate Rectangle tool
+  - First click sets one corner, second click finalizes the rectangle
+  - Live preview updates as you move the mouse
+  - Respects current color and thickness settings
+  - Custom rectangle cursor with corner markers
+  - Supports right-click color cycling and mouse wheel thickness adjustment
+  - Works seamlessly with Eraser tool
+
 ## v1.0.7
 
 ### Added
@@ -22,6 +34,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Screenshot hotkey (`Ctrl+S`) now correctly detects Control key by tracking both left (VK_LCONTROL) and right (VK_RCONTROL) control keys instead of generic VK_CONTROL
 - Thread safety improvements with volatile field for update nesting level
 
+### Changed
+- Snipping tool (`S` key) now properly exits drawing mode to allow user interaction
+- User must manually reactivate drawing mode after using snipping tool (press hotkey)
+
 ## v1.0.6
 
 ### Added

Installer/GhostDraw.Installer.wixproj

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

README.md

@@ -23,6 +23,7 @@
 ## ✨ Features
 
 ### 🎨 **Drawing Tools**
+- **Multiple Drawing Tools** - Switch between Pen (freehand), Line (straight lines), Rectangle (boxes), and Eraser tools with keyboard shortcuts
 - **Customizable Color Palette** - Create your own color collection and cycle through them while drawing
 - **Variable Brush Thickness** - Adjust brush size from 1-100px with configurable min/max ranges
 - **Smooth Drawing** - High-performance rendering for fluid strokes

Src/GhostDraw/App.xaml.cs

@@ -77,6 +77,7 @@ protected override void OnStartup(StartupEventArgs e)
             _keyboardHook.PenToolPressed += OnPenToolPressed;
             _keyboardHook.LineToolPressed += OnLineToolPressed;
             _keyboardHook.EraserToolPressed += OnEraserToolPressed;
+            _keyboardHook.RectangleToolPressed += OnRectangleToolPressed;
             _keyboardHook.HelpPressed += OnHelpPressed;
             _keyboardHook.ScreenshotFullPressed += OnScreenshotFullPressed;
             _keyboardHook.Start();
@@ -307,6 +308,23 @@ private void OnEraserToolPressed(object? sender, EventArgs e)
         }
     }
 
+    private void OnRectangleToolPressed(object? sender, EventArgs e)
+    {
+        try
+        {
+            // Only switch to rectangle tool if drawing mode is active
+            if (_drawingManager?.IsDrawingMode == true)
+            {
+                _logger?.LogInformation("U pressed - selecting rectangle tool");
+                _drawingManager?.SetRectangleTool();
+            }
+        }
+        catch (Exception ex)
+        {
+            _exceptionHandler?.HandleException(ex, "Rectangle tool handler");
+        }
+    }
+
     private void OnHelpPressed(object? sender, EventArgs e)
     {
         try

Src/GhostDraw/Core/DrawTool.cs

@@ -21,5 +21,10 @@ public enum DrawTool
     /// <summary>
     /// Eraser tool - removes drawing objects underneath the cursor
     /// </summary>
-    Eraser
+    Eraser,
+    
+    /// <summary>
+    /// Rectangle tool - click two points to draw a rectangle
+    /// </summary>
+    Rectangle
 }

Src/GhostDraw/Core/GlobalKeyboardHook.cs

@@ -16,6 +16,7 @@ public class GlobalKeyboardHook : IDisposable
     private const int VK_L = 0x4C;         // 76 - 'L' key for line tool
     private const int VK_P = 0x50;         // 80 - 'P' key for pen tool
     private const int VK_E = 0x45;         // 69 - 'E' key for eraser tool
+    private const int VK_U = 0x55;         // 85 - 'U' key for rectangle tool
     private const int VK_F1 = 0x70;        // 112 - 'F1' key for help
     private const int VK_S = 0x53;         // 83 - 'S' key for screenshot (Ctrl+S only)
     private const int VK_LCONTROL = 0xA2;  // 162 - Left Control key
@@ -35,6 +36,7 @@ public class GlobalKeyboardHook : IDisposable
     public event EventHandler? PenToolPressed;
     public event EventHandler? LineToolPressed;
     public event EventHandler? EraserToolPressed;
+    public event EventHandler? RectangleToolPressed;
     public event EventHandler? HelpPressed;
     public event EventHandler? ScreenshotFullPressed;
 
@@ -238,6 +240,13 @@ private nint HookCallback(int nCode, nint wParam, nint lParam)
                     EraserToolPressed?.Invoke(this, EventArgs.Empty);
                 }
 
+                // Check for U key press (rectangle tool)
+                if (vkCode == VK_U && isKeyDown)
+                {
+                    _logger.LogDebug("U key pressed - rectangle tool request");
+                    RectangleToolPressed?.Invoke(this, EventArgs.Empty);
+                }
+
                 // Check for F1 key press (help)
                 if (vkCode == VK_F1 && isKeyDown)
                 {

Src/GhostDraw/Core/ServiceConfiguration.cs

@@ -63,6 +63,7 @@ public static ServiceProvider ConfigureServices()
         services.AddSingleton<GhostDraw.Tools.PenTool>();
         services.AddSingleton<GhostDraw.Tools.LineTool>();
         services.AddSingleton<GhostDraw.Tools.EraserTool>();
+        services.AddSingleton<GhostDraw.Tools.RectangleTool>();
 
         services.AddSingleton<OverlayWindow>();
         services.AddSingleton<GlobalKeyboardHook>();

Src/GhostDraw/GhostDraw.csproj

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

Src/GhostDraw/Helpers/CursorHelper.cs

@@ -259,6 +259,108 @@ public WpfCursor CreateEraserCursor()
         }
     }
 
+    /// <summary>
+    /// Creates a cursor for the Rectangle tool with color indicator
+    /// </summary>
+    /// <param name="colorHex">Hex color for the rectangle (e.g., "#FF0000")</param>
+    /// <returns>Custom cursor</returns>
+    public WpfCursor CreateRectangleCursor(string colorHex)
+    {
+        lock (_cursorLock)
+        {
+            if (_disposed)
+            {
+                _logger.LogWarning("CreateRectangleCursor called on disposed CursorHelper");
+                return WpfCursors.Cross;
+            }
+
+            try
+            {
+                _logger.LogDebug("Creating rectangle cursor with color {Color}", colorHex);
+
+                // Destroy previous cursor handle to prevent leaks
+                if (_currentCursorHandle != nint.Zero)
+                {
+                    try
+                    {
+                        DestroyCursor(_currentCursorHandle);
+                        _logger.LogDebug("Destroyed previous cursor handle");
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Failed to destroy previous cursor handle");
+                    }
+                    _currentCursorHandle = nint.Zero;
+                }
+
+                // Create a bitmap for the cursor (32x32 pixels)
+                int size = 32;
+                using (Bitmap bitmap = new Bitmap(size, size))
+                using (Graphics g = Graphics.FromImage(bitmap))
+                {
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+                    g.Clear(Color.Transparent);
+
+                    // Parse the rectangle color
+                    Color rectColor = ColorTranslator.FromHtml(colorHex);
+
+                    // Draw a small rectangle preview with corner markers
+                    int rectSize = 12;
+                    int rectLeft = 6;
+                    int rectTop = (size - rectSize) / 2;
+
+                    // Draw rectangle outline with the active color
+                    using (Pen rectPen = new Pen(rectColor, 2))
+                    {
+                        g.DrawRectangle(rectPen, rectLeft, rectTop, rectSize, rectSize);
+                    }
+
+                    // Draw corner markers (small filled squares at corners)
+                    int cornerSize = 3;
+                    using (SolidBrush cornerBrush = new SolidBrush(Color.White))
+                    {
+                        // Top-left corner (this is the hotspot)
+                        g.FillRectangle(cornerBrush, rectLeft - 1, rectTop - 1, cornerSize, cornerSize);
+                        // Top-right corner
+                        g.FillRectangle(cornerBrush, rectLeft + rectSize - 1, rectTop - 1, cornerSize, cornerSize);
+                        // Bottom-left corner
+                        g.FillRectangle(cornerBrush, rectLeft - 1, rectTop + rectSize - 1, cornerSize, cornerSize);
+                        // Bottom-right corner
+                        g.FillRectangle(cornerBrush, rectLeft + rectSize - 1, rectTop + rectSize - 1, cornerSize, cornerSize);
+                    }
+
+                    // Draw black outlines for corner markers
+                    using (Pen cornerOutline = new Pen(Color.Black, 1))
+                    {
+                        g.DrawRectangle(cornerOutline, rectLeft - 1, rectTop - 1, cornerSize, cornerSize);
+                        g.DrawRectangle(cornerOutline, rectLeft + rectSize - 1, rectTop - 1, cornerSize, cornerSize);
+                        g.DrawRectangle(cornerOutline, rectLeft - 1, rectTop + rectSize - 1, cornerSize, cornerSize);
+                        g.DrawRectangle(cornerOutline, rectLeft + rectSize - 1, rectTop + rectSize - 1, cornerSize, cornerSize);
+                    }
+
+                    // Convert bitmap to cursor with hotspot at top-left corner marker
+                    nint hCursor = CreateCursorFromBitmap(bitmap, rectLeft, rectTop);
+
+                    if (hCursor != nint.Zero)
+                    {
+                        _currentCursorHandle = hCursor;
+                        _logger.LogDebug("Successfully created rectangle cursor (handle: {Handle})", hCursor);
+
+                        return System.Windows.Interop.CursorInteropHelper.Create(new SafeCursorHandle(hCursor));
+                    }
+                }
+
+                _logger.LogWarning("Failed to create rectangle cursor, returning default");
+                return WpfCursors.Cross;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error creating rectangle cursor, using default");
+                return WpfCursors.Cross;
+            }
+        }
+    }
+
     /// <summary>
     /// Creates a crosshair cursor with color indicator for the Line tool
     /// </summary>

Src/GhostDraw/Managers/DrawingManager.cs

@@ -297,6 +297,31 @@ public void SetEraserTool()
         }
     }
 
+    /// <summary>
+    /// Sets the active tool to Rectangle
+    /// </summary>
+    public void SetRectangleTool()
+    {
+        try
+        {
+            if (_overlayWindow.IsVisible)
+            {
+                _appSettings.SetActiveTool(DrawTool.Rectangle);
+                _overlayWindow.OnToolChanged(DrawTool.Rectangle);
+                _logger.LogInformation("Tool set to Rectangle");
+            }
+            else
+            {
+                _logger.LogDebug("SetRectangleTool ignored - overlay not visible");
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to set rectangle tool");
+            // Don't re-throw - not critical
+        }
+    }
+
     /// <summary>
     /// Shows the help popup with keyboard shortcuts
     /// </summary>