Fix #69: restore windows position is not always correct, since glass …

…frame thickness is not constant.
tom-englert · Dec 16, 2023 · ad9a33a · ad9a33a
1 parent 595f12c
commit ad9a33a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/RegionToShare/ExtensionMethods.cs b/src/RegionToShare/ExtensionMethods.cs
@@ -49,23 +49,26 @@ public static string Serialize(this RECT rect)
             return $"{rect.Left}\t{rect.Top}\t{rect.Right}\t{rect.Bottom}";
         }
 
-        public static void DeserializeFrom(this ref RECT rect, string value)
+        public static bool DeserializeFrom(this ref RECT rect, string value)
         {
             try
             {
                 var parts = value.Split('\t').Select(int.Parse).ToArray();
                 if (parts.Length != 4)
-                    return;
+                    return false;
 
                 rect.Left = parts[0];
                 rect.Top = parts[1];
                 rect.Right = Math.Max(rect.Left + 200, parts[2]);
                 rect.Bottom = Math.Max(rect.Top + 200, parts[3]);
+                return true;
             }
             catch
             {
                 // invalid, just go with input;
             }
+
+            return false;
         }
 
         public static void DrawCursor(this Graphics graphics, RECT nativeRect)

diff --git a/src/RegionToShare/MainWindow.xaml.cs b/src/RegionToShare/MainWindow.xaml.cs
@@ -147,8 +147,11 @@ protected override void OnSourceInitialized(EventArgs e)
                 if (Keyboard.Modifiers != (ModifierKeys.Alt | ModifierKeys.Control))
                 {
                     var placement = _windowHandle.GetWindowPlacement();
-                    placement.NormalPosition.DeserializeFrom(Settings.WindowPlacement);
-                    _windowHandle.SetWindowPlacement(ref placement);
+                    if (placement.NormalPosition.DeserializeFrom(Settings.WindowPlacement))
+                    {
+                        placement.NormalPosition += GlassFrameThickness;
+                        _windowHandle.SetWindowPlacement(ref placement);
+                    }
                 }
 
                 UpdateSizeAndPos();
@@ -290,7 +293,8 @@ protected override void OnClosing(CancelEventArgs e)
     {
         base.OnClosing(e);
 
-        Settings.WindowPlacement = _windowHandle.GetWindowPlacement().NormalPosition.Serialize();
+        var normalPosition = _windowHandle.GetWindowPlacement().NormalPosition - GlassFrameThickness;
+        Settings.WindowPlacement = normalPosition.Serialize();
         Settings.Save();
     }