Added option to reposition window if off-screen. #137

Timthreetwelve · Feb 9, 2025 · 1e0fcf6 · 1e0fcf6
1 parent 1eeae96
commit 1e0fcf6
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 2 deletions.
diff --git a/GetMyIP/Configuration/UserSettings.cs b/GetMyIP/Configuration/UserSettings.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Tim Kennedy. All Rights Reserved. Licensed under the MIT License.
+// Copyright (c) Tim Kennedy. All Rights Reserved. Licensed under the MIT License.
 
 namespace GetMyIP.Configuration;
 
@@ -51,6 +51,12 @@ public partial class UserSettings : ConfigManager<UserSettings>
     [ObservableProperty]
     private bool _keepOnTop;
 
+    /// <summary>
+    /// Keep window on screen.
+    /// </summary>
+    [ObservableProperty]
+    private bool _keepWindowOnScreen = true;
+
     /// <summary>
     /// Enable language testing.
     /// </summary>

diff --git a/GetMyIP/Helpers/MainWindowHelpers.cs b/GetMyIP/Helpers/MainWindowHelpers.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Tim Kennedy. All Rights Reserved. Licensed under the MIT License.
+// Copyright (c) Tim Kennedy. All Rights Reserved. Licensed under the MIT License.
 
 namespace GetMyIP.Helpers;
 
@@ -86,6 +86,8 @@ private static void SetWindowPosition()
         {
             mainWindow.WindowStartupLocation = WindowStartupLocation.CenterScreen;
         }
+
+        KeepWindowOnScreen();
     }
 
     /// <summary>
@@ -101,6 +103,41 @@ private static void SaveWindowPosition()
     }
     #endregion Set and Save MainWindow position and size
 
+    #region Reposition off-screen window back to the desktop
+    /// <summary>
+    /// Keep the window on the screen.
+    /// </summary>
+    private static void KeepWindowOnScreen()
+    {
+        if (_mainWindow is null || !UserSettings.Setting!.KeepWindowOnScreen)
+        {
+            return;
+        }
+
+        if (_mainWindow.Top < SystemParameters.VirtualScreenTop)
+        {
+            _mainWindow.Top = SystemParameters.VirtualScreenTop;
+        }
+
+        if (_mainWindow.Left < SystemParameters.VirtualScreenLeft)
+        {
+            _mainWindow.Left = SystemParameters.VirtualScreenLeft;
+        }
+
+        if (_mainWindow.Left + _mainWindow.Width > SystemParameters.VirtualScreenLeft + SystemParameters.VirtualScreenWidth)
+        {
+            _mainWindow.Left = SystemParameters.VirtualScreenWidth + SystemParameters.VirtualScreenLeft - _mainWindow.Width;
+        }
+
+        if (_mainWindow.Top + _mainWindow.Height > SystemParameters.VirtualScreenTop + SystemParameters.VirtualScreenHeight)
+        {
+            _mainWindow.Top = SystemParameters.WorkArea.Size.Height + SystemParameters.VirtualScreenTop - _mainWindow.Height;
+        }
+    }
+    #endregion Reposition off-screen window back to the desktop
+
+    #region Center the window on the screen
+
     #region Window Title
     /// <summary>
     /// Puts the version number in the title bar as well as Administrator if running elevated
@@ -142,6 +179,11 @@ private static async void MainWindow_StateChanged(object sender, EventArgs e)
     {
         try
         {
+            if (_mainWindow!.WindowState == WindowState.Normal)
+            {
+                KeepWindowOnScreen();
+            }
+
             // if window state is minimized and minimize to tray setting is true then hide the window
             if (_mainWindow!.WindowState == WindowState.Minimized && UserSettings.Setting!.MinimizeToTray)
             {

diff --git a/GetMyIP/Languages/Strings.en-US.xaml b/GetMyIP/Languages/Strings.en-US.xaml
@@ -210,6 +210,7 @@
     <sys:String x:Key="SettingsItem_IncludeIPV6">Include internal IPV6 addresses</sys:String>
     <sys:String x:Key="SettingsItem_InitialPage">Initial page displayed</sys:String>
     <sys:String x:Key="SettingsItem_KeepOnTop">Keep Get My IP on top of other windows</sys:String>
+    <sys:String x:Key="SettingsItem_KeepWindowOnScreen">Reposition off-screen window</sys:String>
     <sys:String x:Key="SettingsItem_LastRefresh">Last refresh:  </sys:String>
     <sys:String x:Key="SettingsItem_Language">Language</sys:String>
     <sys:String x:Key="SettingsItem_MapProvider">Map provider</sys:String>

diff --git a/GetMyIP/Views/SettingsPage.xaml b/GetMyIP/Views/SettingsPage.xaml
@@ -363,6 +363,12 @@
                                   IsChecked="{Binding StartCentered,
                                                       Source={x:Static config:UserSettings.Setting}}" />
                         <CheckBox Grid.Row="2"
+                        <CheckBox Grid.Row="3"
+                                  Padding="10,0"
+                                  Content="{DynamicResource SettingsItem_KeepWindowOnScreen}"
+                                  IsChecked="{Binding KeepWindowOnScreen,
+                                                      Source={x:Static config:UserSettings.Setting}}" />
+                        <CheckBox Grid.Row="4"
                                   Padding="10,0"
                                   Content="{DynamicResource SettingsItem_KeepOnTop}"
                                   IsChecked="{Binding KeepOnTop,