[Mouse Jump] Customisable appearance - borders, margins, colours, etc - final part (#35521)

* [MouseJump] move Mouse Jump settings into separate control (#27511)

* [MouseJump] added Mouse Jump style controls to Settings UI (#27511)

* [MouseJump] added Mouse Jump style controls to Settings UI (#27511)

* [MouseJump] removing unused MouseJumpUI code (#27511)

* [MouseJump] whitespace (#27511)

* [MouseJump] fix spellcheck (#27511)

* [MouseJump] enabled "Copy to custom style" (#27511)

* [MouseJump] fixing build (internal members -> public) (#27511)

* [MouseJump] remove unused "using"s (#27511)

* [MouseJump] use custom styles in preview image (#27511)

* [MouseJump] fixing failing test (#27511)

* [MouseJump] fixing failing test (#27511)

* [MouseJump] fixing failing test (#27511)

* [MouseJump] fixing failing test (#27511)

* [MouseJump] delinting to trigger a build (#27511)

* [MouseJump] updated settings preview image ("browser" header) (#27511)

* [MouseJump] upgrade default "custom" style settings in config (#27511)

* [MouseJump] fixed a glitch in settings upgrade (#27511)

* [MouseJump] fixed spell checker (#27511)

* [MouseJump] typo in resource strings (image -> images) (#27511)

* Remove unused include

src/modules/MouseUtils/MouseJump.Common/Helpers/ConfigHelper.cs

@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Globalization;
+
+namespace MouseJump.Common.Helpers;
+
+public static class ConfigHelper
+{
+    public static Color? ToUnnamedColor(Color? value)
+    {
+        if (!value.HasValue)
+        {
+            return null;
+        }
+
+        var color = value.Value;
+        return Color.FromArgb(color.A, color.R, color.G, color.B);
+    }
+
+    public static string? SerializeToConfigColorString(Color? value)
+    {
+        if (!value.HasValue)
+        {
+            return null;
+        }
+
+        var color = value.Value;
+        return color switch
+        {
+            Color { IsNamedColor: true } =>
+                $"{nameof(Color)}.{color.Name}",
+            Color { IsSystemColor: true } =>
+                $"{nameof(SystemColors)}.{color.Name}",
+            _ =>
+                $"#{color.R:X2}{color.G:X2}{color.B:X2}",
+        };
+    }
+
+    public static Color? DeserializeFromConfigColorString(string? value)
+    {
+        if (string.IsNullOrEmpty(value))
+        {
+            return null;
+        }
+
+        // e.g. "#AABBCC"
+        if (value.StartsWith('#'))
+        {
+            var culture = CultureInfo.InvariantCulture;
+            if ((value.Length == 7)
+                && int.TryParse(value[1..3], NumberStyles.HexNumber, culture, out var r)
+                && int.TryParse(value[3..5], NumberStyles.HexNumber, culture, out var g)
+                && int.TryParse(value[5..7], NumberStyles.HexNumber, culture, out var b))
+            {
+                return Color.FromArgb(0xFF, r, g, b);
+            }
+        }
+
+        const StringComparison comparison = StringComparison.InvariantCulture;
+
+        // e.g. "Color.Red"
+        const string colorPrefix = $"{nameof(Color)}.";
+        if (value.StartsWith(colorPrefix, comparison))
+        {
+            var colorName = value[colorPrefix.Length..];
+            var property = typeof(Color).GetProperties()
+                .SingleOrDefault(property => property.Name == colorName);
+            if (property is not null)
+            {
+                return (Color?)property.GetValue(null, null);
+            }
+        }
+
+        // e.g. "SystemColors.Highlight"
+        const string systemColorPrefix = $"{nameof(SystemColors)}.";
+        if (value.StartsWith(systemColorPrefix, comparison))
+        {
+            var colorName = value[systemColorPrefix.Length..];
+            var property = typeof(SystemColors).GetProperties()
+                .SingleOrDefault(property => property.Name == colorName);
+            if (property is not null)
+            {
+                return (Color?)property.GetValue(null, null);
+            }
+        }
+
+        return null;
+    }
+}

src/modules/MouseUtils/MouseJump.Common/Helpers/DrawingHelper.cs

@@ -102,8 +102,13 @@ public static class DrawingHelper
             return;
         }
 
+        if (borderStyle.Color is null)
+        {
+            return;
+        }
+
         // draw the main box border
-        using var borderBrush = new SolidBrush(borderStyle.Color);
+        using var borderBrush = new SolidBrush(borderStyle.Color.Value);
         var borderRegion = new Region(boxBounds.BorderBounds.ToRectangle());
         borderRegion.Exclude(boxBounds.PaddingBounds.ToRectangle());
         graphics.FillRegion(borderBrush, borderRegion);

src/modules/MouseUtils/MouseJump.Common/Helpers/LayoutHelper.cs

@@ -46,16 +46,13 @@ public static class LayoutHelper
             .Shrink(previewStyle.CanvasStyle.BorderStyle)
             .Shrink(previewStyle.CanvasStyle.PaddingStyle);
 
-        // scale the virtual screen to fit inside the content area
-        var screenScalingRatio = builder.VirtualScreen.Size
-            .ScaleToFitRatio(maxContentSize);
-
         // work out the actual size of the "content area" by scaling the virtual screen
         // to fit inside the maximum content area while maintaining its aspect ration.
         // we'll also offset it to allow for any margins, borders and padding
         var contentBounds = builder.VirtualScreen.Size
-            .Scale(screenScalingRatio)
-            .Floor()
+            .ScaleToFit(maxContentSize, out var scalingRatio)
+            .Round()
+            .Clamp(maxContentSize)
             .PlaceAt(0, 0)
             .Offset(previewStyle.CanvasStyle.MarginStyle.Left, previewStyle.CanvasStyle.MarginStyle.Top)
             .Offset(previewStyle.CanvasStyle.BorderStyle.Left, previewStyle.CanvasStyle.BorderStyle.Top)
@@ -82,16 +79,16 @@ public static class LayoutHelper
                 screen => LayoutHelper.GetBoxBoundsFromOuterBounds(
                     screen
                         .Offset(builder.VirtualScreen.Location.ToSize().Invert())
-                        .Scale(screenScalingRatio)
+                        .Scale(scalingRatio)
                         .Offset(builder.PreviewBounds.ContentBounds.Location.ToSize())
-                        .Truncate(),
+                        .Round(),
                     previewStyle.ScreenStyle))
             .ToList();
 
         return builder.Build();
     }
 
-    internal static RectangleInfo GetCombinedScreenBounds(List<RectangleInfo> screens)
+    public static RectangleInfo GetCombinedScreenBounds(List<RectangleInfo> screens)
     {
         return screens.Skip(1).Aggregate(
             seed: screens.First(),

src/modules/MouseUtils/MouseJump.Common/Helpers/MouseHelper.cs

@@ -102,7 +102,7 @@ public static class MouseHelper
     /// See https://github.com/microsoft/PowerToys/issues/24523
     ///     https://github.com/microsoft/PowerToys/pull/24527
     /// </remarks>
-    internal static void SimulateMouseMovementEvent(PointInfo location)
+    private static void SimulateMouseMovementEvent(PointInfo location)
     {
         var inputs = new User32.INPUT[]
         {

src/modules/MouseUtils/MouseJump.Common/Helpers/StyleHelper.cs

@@ -10,49 +10,9 @@ namespace MouseJump.Common.Helpers;
 public static class StyleHelper
 {
     /// <summary>
-    /// Default v2 preview style
+    /// Compact (legacy) preview style
     /// </summary>
-    public static readonly PreviewStyle DefaultPreviewStyle = new(
-        canvasSize: new(
-            width: 1600,
-            height: 1200
-        ),
-        canvasStyle: new(
-            marginStyle: MarginStyle.Empty,
-            borderStyle: new(
-                color: SystemColors.Highlight,
-                all: 6,
-                depth: 0
-            ),
-            paddingStyle: new(
-                all: 4
-            ),
-            backgroundStyle: new(
-                color1: Color.FromArgb(0xFF, 0x0D, 0x57, 0xD2),
-                color2: Color.FromArgb(0xFF, 0x03, 0x44, 0xC0)
-            )
-        ),
-        screenStyle: new(
-            marginStyle: new(
-                all: 4
-            ),
-            borderStyle: new(
-                color: Color.FromArgb(0xFF, 0x22, 0x22, 0x22),
-                all: 12,
-                depth: 4
-            ),
-            paddingStyle: PaddingStyle.Empty,
-            backgroundStyle: new(
-                color1: Color.MidnightBlue,
-                color2: Color.MidnightBlue
-            )
-        )
-    );
-
-    /// <summary>
-    /// Legacy preview style
-    /// </summary>
-    public static readonly PreviewStyle LegacyPreviewStyle = new(
+    public static readonly PreviewStyle CompactPreviewStyle = new(
         canvasSize: new(
             width: 1600,
             height: 1200
@@ -89,6 +49,46 @@ public static class StyleHelper
         )
     );
 
+    /// <summary>
+    /// Bezelled preview style
+    /// </summary>
+    public static readonly PreviewStyle BezelledPreviewStyle = new(
+        canvasSize: new(
+            width: 1600,
+            height: 1200
+        ),
+        canvasStyle: new(
+            marginStyle: MarginStyle.Empty,
+            borderStyle: new(
+                color: SystemColors.Highlight,
+                all: 6,
+                depth: 0
+            ),
+            paddingStyle: new(
+                all: 4
+            ),
+            backgroundStyle: new(
+                color1: Color.FromArgb(0xFF, 0x0D, 0x57, 0xD2),
+                color2: Color.FromArgb(0xFF, 0x03, 0x44, 0xC0)
+            )
+        ),
+        screenStyle: new(
+            marginStyle: new(
+                all: 4
+            ),
+            borderStyle: new(
+                color: Color.FromArgb(0xFF, 0x22, 0x22, 0x22),
+                all: 12,
+                depth: 4
+            ),
+            paddingStyle: PaddingStyle.Empty,
+            backgroundStyle: new(
+                color1: Color.MidnightBlue,
+                color2: Color.MidnightBlue
+            )
+        )
+    );
+
     public static PreviewStyle WithCanvasSize(this PreviewStyle previewStyle, SizeInfo canvasSize)
     {
         ArgumentNullException.ThrowIfNull(previewStyle);