maskfits 2.0.0__tar.gz → 2.1.0__tar.gz

{maskfits-2.0.0 → maskfits-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: maskfits
-Version: 2.0.0
+Version: 2.1.0
 Summary: A PySide6 GUI for masking pixels in FITS astronomical images.
 Project-URL: Homepage, https://github.com/jnpippert/maskfits
 Project-URL: Repository, https://github.com/jnpippert/maskfits

{maskfits-2.0.0 → maskfits-2.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "maskfits"
-version = "2.0.0"
+version = "2.1.0"
 description = "A PySide6 GUI for masking pixels in FITS astronomical images."
 readme = "README.md"
 requires-python = ">=3.10"

{maskfits-2.0.0 → maskfits-2.1.0}/src/maskfits/gui.py

@@ -391,8 +391,20 @@ class MaskFitsApp(QMainWindow):
             return
         available = screen.availableGeometry()
         margin = 60
-        width = min(preferred_w, max(available.width() - margin, 640))
-        height = min(preferred_h, max(available.height() - margin, 480))
+        floor_w, floor_h = 640, 480
+        width = min(preferred_w, max(available.width() - margin, floor_w))
+        height = min(preferred_h, max(available.height() - margin, floor_h))
+        # Without an explicit minimum, QMainWindow refuses to shrink below
+        # whatever its layout naturally needs (sidebar + toolbar + panels),
+        # which can exceed a laptop's screen width. That's harmless on its
+        # own, but a window manager that later tries to maximize/resize the
+        # window to the real screen size and gets a bigger buffer back than
+        # it asked for can treat it as a protocol violation (observed as a
+        # Wayland "xdg_surface buffer does not match configured maximized
+        # state" fatal error under WSLg) - so cap the minimum explicitly to
+        # whatever we're willing to shrink to, rather than leave it to the
+        # layout's own (possibly larger) size hint.
+        self.setMinimumSize(floor_w, floor_h)
         self.resize(width, height)
         x = available.x() + (available.width() - width) // 2
         y = available.y() + (available.height() - height) // 2
@@ -2138,6 +2150,17 @@ def run_gui(paths: list[str], zoom: Optional[float] = None, mode: Optional[str]
             cuts: Optional[str] = None, colormap: Optional[str] = None, binning: Optional[int] = None,
             smooth: Optional[int] = None, extension: Optional[int] = None) -> int:
     _set_windows_app_id()
+    if QApplication.instance() is None:
+        # Must be set before the QApplication exists. Without this, a
+        # fractional host display scale (e.g. Windows' 150% on a laptop,
+        # relayed through WSLg's Wayland compositor) can get rounded to the
+        # nearest integer factor and then re-applied on top of the
+        # compositor's own scaling, making the window appear far larger
+        # than the screen - PassThrough uses the exact reported factor
+        # instead of rounding it.
+        QApplication.setHighDpiScaleFactorRoundingPolicy(
+            Qt.HighDpiScaleFactorRoundingPolicy.PassThrough
+        )
     app = QApplication.instance() or QApplication(sys.argv)
     # The native per-platform style (macOS in particular) draws QSlider's
     # groove/sub-page/add-page/handle itself as a "complex control" and

{maskfits-2.0.0 → maskfits-2.1.0}/tests/test_window_sizing.py

@@ -73,3 +73,18 @@ def test_window_is_centered_on_the_available_geometry(qapp, monkeypatch):
     expected_y = (1040 - win.height()) // 2
     assert abs(win.x() - expected_x) <= 1
     assert abs(win.y() - expected_y) <= 1
+
+
+def test_window_gets_an_explicit_minimum_size(qapp, monkeypatch):
+    """A window manager maximizing/resizing the window to the real screen
+    size must never get a bigger buffer back than it asked for - without an
+    explicit minimum, QMainWindow can refuse to shrink below whatever its
+    layout naturally needs, which triggered a Wayland protocol violation
+    under WSLg (see this file's module docstring)."""
+    win = MaskFitsApp([], settings=Settings())
+    monkeypatch.setattr(win, "screen", lambda: _FakeScreen(QRect(0, 0, 1920, 1040)))
+
+    win._size_to_screen(1400, 980)
+
+    assert win.minimumWidth() <= 640
+    assert win.minimumHeight() <= 480