Merge pull request #53 from ShareX/feature/XIP0023-annotation-toolbar-refactor

Feature/xip0023 annotation toolbar refactor

Author: McoreD

src/XerahS.Platform.Windows/Recording/MediaFoundationEncoder.cs

@@ -239,12 +239,12 @@ public void WriteFrame(FrameData frame)
                     hr = ComFunctions.Lock(buffer, out var bufferPtr, out var maxLen, out var curLen);
                     if (hr != 0) throw new COMException("Failed to lock buffer", hr);
 
-            try
-            {
-                CopyFrame(frame, bufferPtr, bytesPerRow);
-            }
-            finally
-            {
+                    try
+                    {
+                        CopyFrame(frame, bufferPtr, bytesPerRow);
+                    }
+                    finally
+                    {
                         ComFunctions.Unlock(buffer);
                     }
 
@@ -598,5 +598,3 @@ private static T Call<T>(IntPtr ptr, int index) where T : Delegate
 
     #endregion
 }
-
-

src/XerahS.RegionCapture/Models/RegionSelectionResult.cs

@@ -23,9 +23,16 @@ You should have received a copy of the GNU General Public License
 
 #endregion License Information (GPL v3)
 
+using SkiaSharp;
+
 namespace XerahS.RegionCapture.Models;
 
 /// <summary>
 /// Represents a completed region selection with the cursor position at confirmation time.
+/// Optionally includes an annotation layer to be composited onto the captured image.
 /// </summary>
-public readonly record struct RegionSelectionResult(PixelRect Region, PixelPoint CursorPosition);
+public readonly record struct RegionSelectionResult(
+    PixelRect Region,
+    PixelPoint CursorPosition,
+    SKBitmap? AnnotationLayer = null,
+    PixelPoint MonitorOrigin = default);

src/XerahS.RegionCapture/UI/OverlayWindow.axaml

@@ -1,5 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:controls="clr-namespace:ShareX.Editor.Views.Controls;assembly=ShareX.Editor"
         x:Class="XerahS.RegionCapture.UI.OverlayWindow"
         SystemDecorations="None"
         TransparencyLevelHint="Transparent"
@@ -10,7 +11,25 @@
         ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaChromeHints="NoChrome">
 
-    <Panel x:Name="RootPanel">
-        <!-- Custom rendering control -->
-    </Panel>
+    <Grid>
+        <!-- Region Capture Control Layer -->
+        <Panel x:Name="RootPanel" IsHitTestVisible="True">
+            <!-- Custom rendering control added in code-behind -->
+        </Panel>
+
+        <!-- XIP-0023: Annotation Canvas Layer for drawing shapes -->
+        <!-- IsHitTestVisible is set dynamically based on active tool (false for Select, true for drawing tools) -->
+        <Canvas x:Name="AnnotationCanvas"
+                Background="Transparent"
+                IsHitTestVisible="False"/>
+
+        <!-- XIP-0023: Annotation Toolbar for Overlay mode -->
+        <!-- Positioned below the instruction text (50px margin from top) -->
+        <!-- Press Tab to toggle visibility, ENTER to confirm capture -->
+        <controls:AnnotationToolbar x:Name="AnnotationToolbarControl"
+                                    VerticalAlignment="Top"
+                                    HorizontalAlignment="Center"
+                                    Margin="0,50,0,0"
+                                    IsVisible="True"/>
+    </Grid>
 </Window>