Merge pull request #68 from MHFU-ModKit/studio/restore-maximized

Studio: no freeze when it opens maximized with a saved layout

Author: sp00ktober

apps/studio/src/mhfu_studio/ui/window.py

@@ -243,7 +243,12 @@ def __init__(self, studio: Studio, settings: QSettings | None = None) -> None:
         if not (isinstance(geo, QByteArray) and self.restoreGeometry(geo)):
             self.resize(1500, 940)
         studio.listen(self._schedule)
+        # the layout before the maximize: Qt retries one restored into a hidden, maximized
+        # window on every resize, and on macOS each retry resizes again, forever
+        maximized = self.windowState() & Qt.WindowState.WindowMaximized
+        self.setWindowState(self.windowState() & ~maximized)
         self.sync()
+        self.setWindowState(self.windowState() | maximized)
 
     # ---- docks ----------------------------------------------------------------------- #
 

apps/studio/tests/ui/test_window.py

@@ -176,6 +176,24 @@ def test_old_layouts_are_dropped(make_window: Make) -> None:
     assert again.dockWidgetArea(dock(again, "map/Items")) == LEFT
 
 
+def test_layout_restores_unmaximized(make_window: Make, monkeypatch: pytest.MonkeyPatch) -> None:
+    """A layout restored into a hidden, maximized window looped forever on macOS."""
+    w = make_window()
+    w.showMaximized()
+    w.close()
+    states: list[Qt.WindowState] = []
+    restore = QMainWindow.restoreState
+
+    def spy(self: QMainWindow, state: Any, version: int = 0) -> bool:
+        states.append(self.windowState())
+        return restore(self, state, version)
+
+    monkeypatch.setattr(QMainWindow, "restoreState", spy)
+    again = make_window(show=False)
+    assert states and not any(s & Qt.WindowState.WindowMaximized for s in states)
+    assert again.windowState() & Qt.WindowState.WindowMaximized
+
+
 def test_restore_places_new_docks(make_window: Make) -> None:
     make_window().close()
     w = make_window(Tabbed("map"), Tabbed("monster"))