Merge branch 'dev' into localize-missing-python-js-dialog

Author: Yusyuriv

Flow.Launcher.Core/Flow.Launcher.Core.csproj

@@ -54,8 +54,8 @@
 
   <ItemGroup>
     <PackageReference Include="Droplex" Version="1.7.0" />
-    <PackageReference Include="FSharp.Core" Version="7.0.401" />
-    <PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.2.1" />
+    <PackageReference Include="FSharp.Core" Version="8.0.300" />
+    <PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.0" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
     <PackageReference Include="StreamJsonRpc" Version="2.17.11" />

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

@@ -49,7 +49,7 @@
 
   <ItemGroup>
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
-    <PackageReference Include="BitFaster.Caching" Version="2.5.0" />
+    <PackageReference Include="BitFaster.Caching" Version="2.5.1" />
     <PackageReference Include="Fody" Version="6.5.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Flow.Launcher.Infrastructure/UserSettings/Point2D.cs

@@ -0,0 +1,46 @@
+using System;
+
+namespace Flow.Launcher.Infrastructure.UserSettings;
+
+public record struct Point2D(double X, double Y)
+{
+    public static implicit operator Point2D((double X, double Y) point)
+    {
+        return new Point2D(point.X, point.Y);
+    }
+
+    public static Point2D operator +(Point2D point1, Point2D point2)
+    {
+        return new Point2D(point1.X + point2.X, point1.Y + point2.Y);
+    }
+
+    public static Point2D operator -(Point2D point1, Point2D point2)
+    {
+        return new Point2D(point1.X - point2.X, point1.Y - point2.Y);
+    }
+
+    public static Point2D operator *(Point2D point, double scalar)
+    {
+        return new Point2D(point.X * scalar, point.Y * scalar);
+    }
+
+    public static Point2D operator /(Point2D point, double scalar)
+    {
+        return new Point2D(point.X / scalar, point.Y / scalar);
+    }
+
+    public static Point2D operator /(Point2D point1, Point2D point2)
+    {
+        return new Point2D(point1.X / point2.X, point1.Y / point2.Y);
+    }
+    
+    public static Point2D operator *(Point2D point1, Point2D point2)
+    {
+        return new Point2D(point1.X * point2.X, point1.Y * point2.Y);
+    }
+    
+    public Point2D Clamp(Point2D min, Point2D max)
+    {
+        return new Point2D(Math.Clamp(X, min.X, max.X), Math.Clamp(Y, min.Y, max.Y));
+    }
+}

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -205,8 +205,10 @@ public SearchPrecisionScore QuerySearchPrecision
 
         public bool AutoUpdates { get; set; } = false;
 
-        public double WindowLeft { get; set; }
-        public double WindowTop { get; set; }
+        
+        public Point2D WindowPosition { get; set; }
+        public Point2D PreviousScreen { get; set; }
+        public Point2D PreviousDpi { get; set; }
 
         /// <summary>
         /// Custom left position on selected monitor

Flow.Launcher.Test/Flow.Launcher.Test.csproj

@@ -54,7 +54,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
   </ItemGroup>
 
 </Project>

Flow.Launcher/CustomShortcutSetting.xaml.cs

@@ -1,31 +1,34 @@
 using Flow.Launcher.Core.Resource;
-using Flow.Launcher.ViewModel;
 using System;
 using System.Windows;
 using System.Windows.Input;
+using Flow.Launcher.SettingPages.ViewModels;
 
 namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
+        private readonly SettingsPaneHotkeyViewModel _hotkeyVm;
         public string Key { get; set; } = String.Empty;
         public string Value { get; set; } = String.Empty;
-        private string originalKey { get; init; } = null;
-        private string originalValue { get; init; } = null;
-        private bool update { get; init; } = false;
+        private string originalKey { get; } = null;
+        private string originalValue { get; } = null;
+        private bool update { get; } = false;
 
-        public CustomShortcutSetting(SettingWindowViewModel vm)
+        public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm)
         {
+            _hotkeyVm = vm;
             InitializeComponent();
         }
 
-        public CustomShortcutSetting(string key, string value)
+        public CustomShortcutSetting(string key, string value, SettingsPaneHotkeyViewModel vm)
         {
             Key = key;
             Value = value;
             originalKey = key;
             originalValue = value;
             update = true;
+            _hotkeyVm = vm;
             InitializeComponent();
         }
 
@@ -43,7 +46,7 @@ private void BtnAdd_OnClick(object sender, RoutedEventArgs e)
                 return;
             }
             // Check if key is modified or adding a new one
-            if ((update && originalKey != Key) || !update)
+            if (((update && originalKey != Key) || !update) && _hotkeyVm.DoesShortcutExist(Key))
             {
                 MessageBox.Show(InternationalizationManager.Instance.GetTranslation("duplicateShortcut"));
                 return;