Prevent ServerLogWindow from being out of screens

HMBSbige · Oct 9, 2019 · a8768fb · a8768fb
1 parent b3e1dc2
commit a8768fb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/shadowsocks-csharp/Model/WindowStatus.cs b/shadowsocks-csharp/Model/WindowStatus.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Shadowsocks.Util;
+using System.Windows;
 
 namespace Shadowsocks.Model
 {
@@ -35,6 +36,7 @@ public void SetStatus(Window window)
             window.Left = Left;
             window.Top = Top;
             window.WindowState = State;
+            window.WindowStartupLocation = ViewUtils.IsOnScreen(window) ? WindowStartupLocation.Manual : WindowStartupLocation.CenterScreen;
         }
     }
 }
diff --git a/shadowsocks-csharp/Util/ViewUtils.cs b/shadowsocks-csharp/Util/ViewUtils.cs
@@ -164,5 +164,20 @@ public static void SetResource(ResourceDictionary resources, string filename, in
                 resources.MergedDictionaries.Add(langRd);
             }
         }
+
+        public static bool IsOnScreen(Window window)
+        {
+            return IsOnScreen(window.Left, window.Top)
+                || IsOnScreen(window.Left + window.Width, window.Top + window.Height);
+        }
+
+        public static bool IsOnScreen(double x, double y)
+        {
+            return
+                    SystemParameters.VirtualScreenLeft <= x &&
+                    SystemParameters.VirtualScreenLeft + SystemParameters.VirtualScreenWidth >= x &&
+                    SystemParameters.VirtualScreenTop <= y &&
+                    SystemParameters.VirtualScreenTop + SystemParameters.VirtualScreenHeight >= y;
+        }
     }
 }
diff --git a/shadowsocks-csharp/View/ServerLogWindow.xaml.cs b/shadowsocks-csharp/View/ServerLogWindow.xaml.cs
@@ -39,7 +39,6 @@ public ServerLogWindow(ShadowsocksController controller, WindowStatus status)
             else
             {
                 SizeToContent = SizeToContent.Manual;
-                WindowStartupLocation = WindowStartupLocation.Manual;
                 status.SetStatus(this);
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 else
                 {
                     SizeToContent = SizeToContent.Manual;
-                    WindowStartupLocation = WindowStartupLocation.Manual;
                     status.SetStatus(this);
                 }
             }
@@ Expand Down @@