Fix Logic

Author: onesounds

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -89,8 +89,8 @@ public string Theme
         public double SettingWindowWidth { get; set; } = 1000;
         public double SettingWindowHeight { get; set; } = 700;
         public bool SettingWindowFirstLaunch { get; set; } = true;
-        public double SettingWindowTop { get; set; }
-        public double SettingWindowLeft { get; set; }
+        public double? SettingWindowTop { get; set; } = null;
+        public double? SettingWindowLeft { get; set; } = null;
         public System.Windows.WindowState SettingWindowState { get; set; } = WindowState.Normal;
 
         public int CustomExplorerIndex { get; set; } = 0;

Flow.Launcher/SettingWindow.xaml.cs

@@ -110,16 +110,16 @@ private void Window_StateChanged(object sender, EventArgs e)
 
     public void InitializePosition()
     {
-        if (_settings.SettingWindowFirstLaunch || _settings.SettingWindowFirstLaunch == null)
+        if (_settings.SettingWindowTop == null || _settings.SettingWindowLeft == null)
         {
             Top = WindowTop();
             Left = WindowLeft();
             _settings.SettingWindowFirstLaunch = false;
         }
         else
         {
-            Top = _settings.SettingWindowTop;
-            Left = _settings.SettingWindowLeft;
+            Top = _settings.SettingWindowTop.Value;
+            Left = _settings.SettingWindowLeft.Value;
         }
         WindowState = _settings.SettingWindowState;
     }

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

@@ -52,13 +52,13 @@ public double SettingWindowHeight
         set => Settings.SettingWindowHeight = value;
     }
 
-    public double SettingWindowTop
+    public double? SettingWindowTop
     {
         get => Settings.SettingWindowTop;
         set => Settings.SettingWindowTop = value;
     }
 
-    public double SettingWindowLeft
+    public double? SettingWindowLeft
     {
         get => Settings.SettingWindowLeft;
         set => Settings.SettingWindowLeft = value;