Merge pull request #18 from RuntimeRascal/feat/support-line-draw

Add Line Drawing Tool

Author: RuntimeRascal

CHANGELOG.md

@@ -0,0 +1,118 @@
+# Changelog
+
+All notable changes to GhostDraw will be documented in this file.
+
+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.5
+
+### Added
+- **Line Tool** - Draw straight lines by clicking two points
+  - Press `L` to activate Line tool
+  - First click sets start point, second click finalizes the line
+  - Real-time preview follows cursor
+  - Line thickness and color adjust dynamically with mouse wheel and right-click
+- **Explicit Tool Selection** - Direct keyboard shortcuts for tool switching
+  - Press `P` to select Pen tool (freehand drawing)
+  - Press `L` to select Line tool (straight lines)
+- **Keyboard Shortcuts Help** - F1 help popup showing all available shortcuts
+  - Press `F1` while in drawing mode to display help overlay
+  - Shows current activation hotkey combination dynamically
+  - Displays all drawing tools, actions, and system shortcuts
+  - Auto-fades after 4 seconds with smooth animations
+- **Settings Architecture Improvements**
+  - Abstracted settings persistence with `ISettingsStore` interface
+  - `FileSettingsStore` for production file-based persistence
+  - `InMemorySettingsStore` for isolated unit testing
+  - Eliminated file system dependencies from unit tests
+
+### Changed
+- Tool selection now uses explicit methods instead of toggle-only behavior
+- Test suite refactored to use in-memory storage, eliminating test pollution
+- Settings service now uses dependency injection for storage layer
+
+### Fixed
+- Line tool cursor hotspot now correctly positioned at line start point (left circle)
+- Test isolation issues resolved - no more shared file system state
+
+## v1.0.0-v1.0.4 - Initial Releases
+
+### Added
+- **Drawing Mode Activation**
+  - Configurable hotkey combination (default: Ctrl+Alt+D)
+  - Toggle or hold mode options
+- **Pen Tool** - Freehand drawing with mouse
+  - Click and drag to draw smooth polylines
+  - Adjustable brush thickness (1-20 pixels)
+  - 10-color palette with cycling
+- **Brush Customization**
+  - Right-click to cycle through color palette
+  - Mouse wheel to adjust brush thickness
+  - Real-time thickness indicator overlay
+- **Canvas Management**
+  - Press `R` to clear canvas with visual feedback
+  - Press `ESC` for emergency exit from drawing mode
+  - Canvas spans all monitors in multi-monitor setups
+- **System Tray Integration**
+  - Always-running background application
+  - Context menu for quick access to settings
+  - Log level adjustment from tray
+- **Settings Window**
+  - Cyberpunk-themed UI
+  - Drawing settings (brush thickness, color palette)
+  - Hotkey configuration with visual recorder
+  - Mode settings (toggle vs hold)
+  - Logging level configuration
+- **Robust Error Handling**
+  - Global exception handler prevents system lockout
+  - Comprehensive logging with Serilog
+  - Safe hook cleanup on exit
+- **Custom Cursors**
+  - Colored pencil cursor shows active brush color
+  - Line tool cursor with dual circles and connecting line
+
+### Technical Features
+- WPF transparent overlay across all screens
+- Global Windows keyboard/mouse hooks
+- Dependency injection with Microsoft.Extensions.DependencyInjection
+- Structured logging with Serilog
+- Settings persistence in LocalApplicationData
+- .NET 8 target framework
+
+---
+
+## How to Update This Changelog
+
+When adding new features or fixes:
+
+1. Add entries under the `[Unreleased]` section
+2. Use these categories:
+   - `Added` - New features
+   - `Changed` - Changes to existing functionality
+   - `Deprecated` - Soon-to-be removed features
+   - `Removed` - Removed features
+   - `Fixed` - Bug fixes
+   - `Security` - Security fixes
+
+3. When releasing a new version:
+   - Change `[Unreleased]` to `[X.Y.Z] - YYYY-MM-DD`
+   - Create a new `[Unreleased]` section at the top
+   - Update version numbers according to [Semantic Versioning](https://semver.org/):
+     - MAJOR version for incompatible API changes
+     - MINOR version for backwards-compatible functionality additions
+     - PATCH version for backwards-compatible bug fixes
+
+### Example Entry Format
+
+```markdown
+## [Unreleased]
+
+### Added
+- **Feature Name** - Brief description
+  - Detail about feature
+  - Another detail
+
+### Fixed
+- Issue description and what was fixed
+```

Installer/GhostDraw.Installer.wixproj

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

Src/GhostDraw/App.xaml.cs

@@ -74,6 +74,9 @@ protected override void OnStartup(StartupEventArgs e)
             _keyboardHook.HotkeyReleased += OnHotkeyReleased;
             _keyboardHook.EscapePressed += OnEscapePressed;
             _keyboardHook.ClearCanvasPressed += OnClearCanvasPressed;
+            _keyboardHook.PenToolPressed += OnPenToolPressed;
+            _keyboardHook.LineToolPressed += OnLineToolPressed;
+            _keyboardHook.HelpPressed += OnHelpPressed;
             _keyboardHook.Start();
 
             // Setup system tray icon
@@ -251,6 +254,57 @@ private void OnClearCanvasPressed(object? sender, EventArgs e)
         }
     }
 
+    private void OnPenToolPressed(object? sender, EventArgs e)
+    {
+        try
+        {
+            // Only switch to pen tool if drawing mode is active
+            if (_drawingManager?.IsDrawingMode == true)
+            {
+                _logger?.LogInformation("P pressed - selecting pen tool");
+                _drawingManager?.SetPenTool();
+            }
+        }
+        catch (Exception ex)
+        {
+            _exceptionHandler?.HandleException(ex, "Pen tool handler");
+        }
+    }
+
+    private void OnLineToolPressed(object? sender, EventArgs e)
+    {
+        try
+        {
+            // Only switch to line tool if drawing mode is active
+            if (_drawingManager?.IsDrawingMode == true)
+            {
+                _logger?.LogInformation("L pressed - selecting line tool");
+                _drawingManager?.SetLineTool();
+            }
+        }
+        catch (Exception ex)
+        {
+            _exceptionHandler?.HandleException(ex, "Line tool handler");
+        }
+    }
+
+    private void OnHelpPressed(object? sender, EventArgs e)
+    {
+        try
+        {
+            // Show help overlay if drawing mode is active
+            if (_drawingManager?.IsDrawingMode == true)
+            {
+                _logger?.LogInformation("F1 pressed - showing help");
+                _drawingManager?.ShowHelp();
+            }
+        }
+        catch (Exception ex)
+        {
+            _exceptionHandler?.HandleException(ex, "Help pressed handler");
+        }
+    }
+
     protected override void OnExit(ExitEventArgs e)
     {
         _logger?.LogInformation("Application exiting");

Src/GhostDraw/Core/AppSettings.cs

@@ -31,6 +31,12 @@ public class AppSettings
     [JsonPropertyName("maxBrushThickness")]
     public double MaxBrushThickness { get; set; } = 20.0;
 
+    /// <summary>
+    /// The currently active drawing tool
+    /// </summary>
+    [JsonPropertyName("activeTool")]
+    public DrawTool ActiveTool { get; set; } = DrawTool.Pen;
+
     /// <summary>
     /// Virtual key codes for the hotkey combination
     /// </summary>
@@ -86,6 +92,7 @@ public AppSettings Clone()
             BrushThickness = BrushThickness,
             MinBrushThickness = MinBrushThickness,
             MaxBrushThickness = MaxBrushThickness,
+            ActiveTool = ActiveTool,
             HotkeyVirtualKeys = new List<int>(HotkeyVirtualKeys),
             LockDrawingMode = LockDrawingMode,
             LogLevel = LogLevel,

Src/GhostDraw/Core/DrawTool.cs

@@ -0,0 +1,20 @@
+using System.Text.Json.Serialization;
+
+namespace GhostDraw.Core;
+
+/// <summary>
+/// Available drawing tools
+/// </summary>
+[JsonConverter(typeof(JsonStringEnumConverter))]
+public enum DrawTool
+{
+    /// <summary>
+    /// Freehand drawing tool (default)
+    /// </summary>
+    Pen,
+    
+    /// <summary>
+    /// Straight line tool - click two points to draw a line
+    /// </summary>
+    Line
+}

Src/GhostDraw/Core/GlobalKeyboardHook.cs

@@ -13,6 +13,9 @@ public class GlobalKeyboardHook : IDisposable
     // Only keep VK_ESCAPE constant (emergency exit)
     private const int VK_ESCAPE = 0x1B;    // 27
     private const int VK_R = 0x52;         // 82 - 'R' key for clear canvas
+    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_F1 = 0x70;        // 112 - 'F1' key for help
 
     private readonly ILogger<GlobalKeyboardHook> _logger;
     private readonly LowLevelKeyboardProc _proc;
@@ -25,6 +28,9 @@ public class GlobalKeyboardHook : IDisposable
     public event EventHandler? HotkeyReleased;
     public event EventHandler? EscapePressed;
     public event EventHandler? ClearCanvasPressed;
+    public event EventHandler? PenToolPressed;
+    public event EventHandler? LineToolPressed;
+    public event EventHandler? HelpPressed;
 
     // NEW: Raw key events for recorder
     public event EventHandler<KeyEventArgs>? KeyPressed;
@@ -190,6 +196,27 @@ private nint HookCallback(int nCode, nint wParam, nint lParam)
                     ClearCanvasPressed?.Invoke(this, EventArgs.Empty);
                 }
 
+                // Check for L key press (line tool)
+                if (vkCode == VK_L && isKeyDown)
+                {
+                    _logger.LogDebug("L key pressed - line tool request");
+                    LineToolPressed?.Invoke(this, EventArgs.Empty);
+                }
+
+                // Check for P key press (pen tool)
+                if (vkCode == VK_P && isKeyDown)
+                {
+                    _logger.LogDebug("P key pressed - pen tool request");
+                    PenToolPressed?.Invoke(this, EventArgs.Empty);
+                }
+
+                // Check for F1 key press (help)
+                if (vkCode == VK_F1 && isKeyDown)
+                {
+                    _logger.LogDebug("F1 key pressed - help request");
+                    HelpPressed?.Invoke(this, EventArgs.Empty);
+                }
+
                 // Track hotkey state
                 if (_hotkeyVKs.Contains(vkCode))
                 {

Src/GhostDraw/Core/ServiceConfiguration.cs

@@ -51,6 +51,9 @@ public static ServiceProvider ConfigureServices()
             builder.AddSerilog(dispose: true);
         });
 
+        // Register settings store (file-based for production)
+        services.AddSingleton<ISettingsStore, FileSettingsStore>();
+
         // Register application services (order matters for dependencies)
         services.AddSingleton<AppSettingsService>();
         services.AddSingleton<CursorHelper>();

Src/GhostDraw/GhostDraw.csproj

@@ -8,7 +8,7 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>Assets\favicon.ico</ApplicationIcon>
-    <Version>1.0.4</Version>
+    <Version>1.0.5</Version>
   </PropertyGroup>
 
   <ItemGroup>