[Mouse Jump] - adding predefined "preview types" to settings ui - mic…

…rosoft#25482

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

@@ -11,6 +11,17 @@ 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)

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

@@ -12,9 +12,9 @@ namespace MouseJump.Common.Helpers;
 public static class StyleHelper
 {
     /// <summary>
-    /// Default v2 preview style
+    /// Compact (legacy) preview style
     /// </summary>
-    internal static readonly PreviewStyle DefaultPreviewStyle = new(
+    public static readonly PreviewStyle CompactPreviewStyle = new(
         canvasSize: new(
             width: 1600,
             height: 1200
@@ -27,7 +27,7 @@ public static class StyleHelper
                 depth: 0
             ),
             paddingStyle: new(
-                all: 4
+                all: 0
             ),
             backgroundStyle: new(
                 color1: Color.FromArgb(0xFF, 0x0D, 0x57, 0xD2),
@@ -36,12 +36,12 @@ public static class StyleHelper
         ),
         screenStyle: new(
             marginStyle: new(
-                all: 4
+                all: 0
             ),
             borderStyle: new(
                 color: Color.FromArgb(0xFF, 0x22, 0x22, 0x22),
-                all: 12,
-                depth: 4
+                all: 0,
+                depth: 0
             ),
             paddingStyle: PaddingStyle.Empty,
             backgroundStyle: new(
@@ -52,9 +52,9 @@ public static class StyleHelper
     );
 
     /// <summary>
-    /// Legacy preview style
+    /// Bezelled preview style
     /// </summary>
-    public static readonly PreviewStyle LegacyPreviewStyle = new(
+    public static readonly PreviewStyle BezelledPreviewStyle = new(
         canvasSize: new(
             width: 1600,
             height: 1200
@@ -67,7 +67,7 @@ public static class StyleHelper
                 depth: 0
             ),
             paddingStyle: new(
-                all: 0
+                all: 4
             ),
             backgroundStyle: new(
                 color1: Color.FromArgb(0xFF, 0x0D, 0x57, 0xD2),
@@ -76,12 +76,12 @@ public static class StyleHelper
         ),
         screenStyle: new(
             marginStyle: new(
-                all: 0
+                all: 4
             ),
             borderStyle: new(
                 color: Color.FromArgb(0xFF, 0x22, 0x22, 0x22),
-                all: 0,
-                depth: 0
+                all: 12,
+                depth: 4
             ),
             paddingStyle: PaddingStyle.Empty,
             backgroundStyle: new(

src/modules/MouseUtils/MouseJump.Common/Models/Settings/PreviewType.cs

@@ -0,0 +1,12 @@
+// 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.
+
+namespace MouseJumpUI.Common.Models.Settings;
+
+public enum PreviewType
+{
+    Custom = 0,
+    Compact = 1,
+    Bezelled = 2,
+}

src/modules/MouseUtils/MouseJumpUI/MainForm.cs

@@ -182,7 +182,7 @@ public void ShowPreview()
         var screens = ScreenHelper.GetAllScreens().Select(screen => screen.DisplayArea).ToList();
         var activatedLocation = MouseHelper.GetCursorPosition();
         this.PreviewLayout = LayoutHelper.GetPreviewLayout(
-            previewStyle: StyleHelper.LegacyPreviewStyle.WithCanvasSize(
+            previewStyle: StyleHelper.CompactPreviewStyle.WithCanvasSize(
                 new(
                     appSettings.Properties.ThumbnailSize.Width,
                     appSettings.Properties.ThumbnailSize.Height

src/settings-ui/Settings.UI.Library/MouseJumpProperties.cs

@@ -26,6 +26,17 @@ public MouseJumpThumbnailSize ThumbnailSize
             set;
         }
 
+        /// <summary>
+        /// Gets or sets the preview type.
+        /// Allowed values are "compact", "bezelled", "custom"
+        /// </summary>
+        [JsonPropertyName("preview_type")]
+        public string PreviewType
+        {
+            get;
+            set;
+        }
+
         [JsonPropertyName("background_color_1")]
         public string BackgroundColor1
         {

src/settings-ui/Settings.UI/Converters/MouseJumpPreviewTypeConverter.cs

@@ -0,0 +1,69 @@
+// 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;
+using Microsoft.UI.Xaml.Data;
+using MouseJumpUI.Common.Models.Settings;
+
+namespace Microsoft.PowerToys.Settings.UI.Converters
+{
+    public sealed class MouseJumpPreviewTypeConverter : IValueConverter
+    {
+        private static readonly PreviewType[] PreviewTypeOrder =
+        [
+            PreviewType.Compact, PreviewType.Bezelled, PreviewType.Custom,
+        ];
+
+        private static readonly PreviewType DefaultPreviewType = PreviewType.Bezelled;
+
+        // Receives a string as a parameter and returns an int representing the index
+        // to select in the Segmented control on the Mouse Jump settings page
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var previewType = MouseJumpPreviewTypeConverter.DefaultPreviewType;
+
+            if (value is not string previewTypeName)
+            {
+                // the value isn't a string so just use the default preview type
+            }
+            else if (Enum.IsDefined(typeof(PreviewType), previewTypeName))
+            {
+                // there's a case-sensitive match for the value
+                previewType = Enum.Parse<PreviewType>(previewTypeName);
+            }
+            else if (Enum.TryParse<PreviewType>(previewTypeName, true, out var previewTypeResult))
+            {
+                // there's a case-insensitive match for the value
+                previewType = previewTypeResult;
+            }
+
+            return Array.IndexOf(
+                MouseJumpPreviewTypeConverter.PreviewTypeOrder,
+                previewType);
+        }
+
+        // Receives an int as a parameter that represents the selected index in the Segmented
+        // control on the Mouse Jump settings page, and returns the name of the PreviewType enum
+        // for that index.
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            var previewType = MouseJumpPreviewTypeConverter.DefaultPreviewType;
+
+            if (value is not int segmentedIndex)
+            {
+                // the value isn't an int so just use the default preview type
+            }
+            else if ((segmentedIndex < 0) || (segmentedIndex > MouseJumpPreviewTypeConverter.PreviewTypeOrder.Length))
+            {
+                // not a valid selected index so just use the default preview type
+            }
+            else
+            {
+                previewType = MouseJumpPreviewTypeConverter.PreviewTypeOrder[segmentedIndex];
+            }
+
+            return previewType.ToString();
+        }
+    }
+}

src/settings-ui/Settings.UI/PowerToys.Settings.csproj

@@ -81,6 +81,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
     <PackageReference Include="CommunityToolkit.WinUI.Animations" />