fix(window): clamp restored window geometry into the visible screen, center when fully off-screen

Author: gowthvm

tests/test_ui_features.py

@@ -179,3 +179,57 @@ def test_flash_without_drive_errors_when_none_detected(qapp, tmp_path):
         assert "plug one in first" in w._progress._error.text()
     finally:
         w._shutdown()
+
+
+def _screen_area():
+    from PyQt6.QtGui import QGuiApplication
+
+    screen = QGuiApplication.primaryScreen()
+    return screen.availableGeometry() if screen is not None else None
+
+
+def test_restored_geometry_clamped_inside_screen(qapp, tmp_path):
+    """A window whose saved position hangs off the right edge must be
+    pulled back so nothing is cut off at the border."""
+    available = _screen_area()
+    if available is None:
+        pytest.skip("no screen in this environment")
+
+    w = _make_window(qapp, tmp_path)
+    try:
+        w.resize(
+            min(900, available.width() - 20),
+            min(580, available.height() - 20),
+        )
+        w.move(available.right() - w.width() // 2 + 150, available.top() + 40)
+        w._clamp_to_screen()
+        frame = w.frameGeometry()
+        assert frame.left() >= available.left()
+        assert frame.right() <= available.right()
+        assert frame.top() >= available.top()
+        assert frame.bottom() <= available.bottom()
+    finally:
+        w._shutdown()
+
+
+def test_fully_offscreen_geometry_centered_on_screen(qapp, tmp_path):
+    """A saved position outside every screen must fall back to a centered
+    placement instead of opening unreachable."""
+    available = _screen_area()
+    if available is None:
+        pytest.skip("no screen in this environment")
+
+    w = _make_window(qapp, tmp_path)
+    try:
+        w.resize(
+            min(900, available.width() - 20),
+            min(580, available.height() - 20),
+        )
+        w.move(available.right() + 500, available.top() + 100)
+        w._clamp_to_screen()
+        frame = w.frameGeometry()
+        assert frame.intersects(available)
+        assert abs(frame.center().x() - available.center().x()) <= 3
+        assert abs(frame.center().y() - available.center().y()) <= 3
+    finally:
+        w._shutdown()

ui/window.py

@@ -1169,6 +1169,7 @@ def __init__(self) -> None:
             self.restoreGeometry(
                 QByteArray.fromBase64(geometry.encode("ascii"))
             )
+            self._clamp_to_screen()
 
         self._poller = DrivePoller(self._detector, 2000)
         self._poller.drives_ready.connect(self._on_drives_ready)
@@ -1216,6 +1217,50 @@ def __init__(self) -> None:
         except Exception:
             pass
 
+    def _clamp_to_screen(self) -> None:
+        """Keep the window inside the current screen's visible area.
+
+        The saved window geometry can put the window partially or fully
+        off-screen after a monitor change or resolution switch, which
+        leaves the right side unreachable. Shrink to fit when possible,
+        clamp the position to the edges, and center the window when it
+        does not intersect any screen at all.
+        """
+        frame = self.frameGeometry()
+        screen = QGuiApplication.screenAt(frame.center())
+        if screen is None:
+            screen = QGuiApplication.primaryScreen()
+        if screen is None:
+            return
+        available = screen.availableGeometry()
+        if not frame.intersects(available):
+            self.move(
+                available.center().x() - self.width() // 2,
+                available.center().y() - self.height() // 2,
+            )
+            return
+        if (
+            frame.width() > available.width()
+            and available.width() >= self.minimumWidth()
+        ):
+            self.resize(available.width(), self.height())
+            frame = self.frameGeometry()
+        if (
+            frame.height() > available.height()
+            and available.height() >= self.minimumHeight()
+        ):
+            self.resize(self.width(), available.height())
+            frame = self.frameGeometry()
+        x = min(
+            max(frame.x(), available.left()),
+            available.right() - frame.width(),
+        )
+        y = min(
+            max(frame.y(), available.top()),
+            available.bottom() - frame.height(),
+        )
+        self.move(x, y)
+
     def _busy(self) -> bool:
         return bool(
             self._writing