- improved docstring

- store width+height
- reuse coreutils function

Author: Wurschdhaud

pyrevitlib/pyrevit/script.py

@@ -8,7 +8,7 @@
     script.exit()
     ```
 """
-#pylint: disable=consider-using-f-string
+# pylint: disable=consider-using-f-string
 
 import sys
 import os
@@ -38,7 +38,7 @@
 # suppress any warning generated by native or third-party modules
 warnings.filterwarnings("ignore")
 
-#pylint: disable=W0703,C0302,C0103,W0614
+# pylint: disable=W0703,C0302,C0103,W0614
 mlogger = logger.get_logger(__name__)
 
 
@@ -807,8 +807,8 @@ def restore_window_position(window, command_name=EXEC_PARAMS.command_name):
     Restore window position from saved data.
 
     Args:
-        window: WPF window instance
-        command_name: Unique identifier for this window
+        window (System.Windows.Window): WPF window instance
+        command_name (str): Unique identifier for this window
 
     Returns:
         bool: True if position was restored, False if centered to screen
@@ -820,26 +820,27 @@ def restore_window_position(window, command_name=EXEC_PARAMS.command_name):
         if not pos:
             raise Exception("No saved position")
 
-        # Get all screen working areas
-        all_bounds = [s.WorkingArea for s in framework.Forms.Screen.AllScreens]
-        x, y = pos.get("Left", 0), pos.get("Top", 0)
-
-        # Check if position is visible on any screen
-        visible = any(
-            (b.Left <= x <= b.Right and b.Top <= y <= b.Bottom) for b in all_bounds
+        left, top, width, height = (
+            pos.get("Left", 0),
+            pos.get("Top", 0),
+            pos.get("Width", window.Width),
+            pos.get("Height", window.Height),
         )
 
-        if visible:
+        if coreutils.is_box_visible_on_screens(left, top, width, height):
             window.WindowStartupLocation = (
                 framework.Windows.WindowStartupLocation.Manual
             )
-            window.Left = x
-            window.Top = y
+            window.Left = left
+            window.Top = top
+            window.Width = width
+            window.Height = height
             return True
         else:
             raise Exception("Position not visible on any screen")
 
-    except Exception:
+    except Exception as ex:
+        mlogger.debug("Could not restore window position: %s", ex)
         window.WindowStartupLocation = (
             framework.Windows.WindowStartupLocation.CenterScreen
         )
@@ -851,9 +852,14 @@ def save_window_position(window, command_name=EXEC_PARAMS.command_name):
     Save window position to persistent storage.
 
     Args:
-        window: WPF window instance
-        command_name: Unique identifier for this window
+        window (System.Windows.Window): WPF window instance
+        command_name (str): Unique identifier for this window
     """
     storage_key = "last_window_position_" + command_name
-    position_data = {"Left": window.Left, "Top": window.Top}
+    position_data = {
+        "Left": window.Left,
+        "Top": window.Top,
+        "Width": window.ActualWidth,
+        "Height": window.ActualHeight
+    }
     store_data(storage_key, position_data, this_project=False)