#117 center window, if no settings present

Ruben2776 · Mar 8, 2024 · 77e51ef · 77e51ef
1 parent a6bff20
commit 77e51ef
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/PicView.WPF/UILogic/Loading/StartLoading.cs b/src/PicView.WPF/UILogic/Loading/StartLoading.cs
@@ -30,10 +30,17 @@ internal static async Task LoadedEvent(Startup_Window startupWindow)
 
         // Load sizing properties
         MonitorInfo = MonitorSize.GetMonitorSize(startupWindow);
-        await SettingsHelper.LoadSettingsAsync().ConfigureAwait(false);
-        if (SettingsHelper.Settings.WindowProperties.AutoFit == false && SettingsHelper.Settings.WindowProperties.Fullscreen == false)
+        var settingsExist = await SettingsHelper.LoadSettingsAsync().ConfigureAwait(false);
+        if (settingsExist)
         {
-            SetLastWindowSize(startupWindow);
+            if (SettingsHelper.Settings.WindowProperties.AutoFit == false && SettingsHelper.Settings.WindowProperties.Fullscreen == false)
+            {
+                SetLastWindowSize(startupWindow);
+            }
+            else
+            {
+                CenterWindowOnScreen(startupWindow);
+            }
         }
         else
         {
@@ -95,7 +102,14 @@ await startupWindow.Dispatcher.InvokeAsync(() =>
             SetWindowBehavior();
             if (SettingsHelper.Settings.WindowProperties.AutoFit == false)
             {
-                SetLastWindowSize(mainWindow);
+                if (!settingsExist)
+                {
+                    CenterWindowOnScreen(mainWindow);
+                }
+                else
+                {
+                    SetLastWindowSize(mainWindow);
+                }
             }
 
             mainWindow.Scroller.VerticalScrollBarVisibility = SettingsHelper.Settings.Zoom.ScrollEnabled

diff --git a/src/PicView.WPF/UILogic/Sizing/WindowSizing.cs b/src/PicView.WPF/UILogic/Sizing/WindowSizing.cs
@@ -279,13 +279,11 @@ internal static void CenterWindowOnScreen(Window window, bool horizontal = true)
     {
         window?.Dispatcher.Invoke(() =>
         {
-            window.Top =
-                ((MonitorInfo.WorkArea.Height * MonitorInfo.DpiScaling) - window.ActualHeight) / 2 +
-                MonitorInfo.WorkArea.Top;
+            var width = window.ActualWidth == 0 ? window.Width : window.ActualWidth;
+            width = double.IsNaN(width) ? window.MinWidth : width;
+            window.Top = (MonitorInfo.WorkArea.Height * MonitorInfo.DpiScaling - width) / 2 + MonitorInfo.WorkArea.Top;
             if (horizontal)
-                window.Left =
-                    ((MonitorInfo.WorkArea.Width * MonitorInfo.DpiScaling) - window.ActualWidth) / 2 +
-                    MonitorInfo.WorkArea.Left;
+                window.Left = (MonitorInfo.WorkArea.Width * MonitorInfo.DpiScaling - width) / 2 + MonitorInfo.WorkArea.Left;
         });
     }