From 938c55ca01101775b6a30aa657079249677c2d3c Mon Sep 17 00:00:00 2001 From: Kris Cherven <50562493+krischerven@users.noreply.github.com> Date: Wed, 19 Mar 2025 10:58:42 +0000 Subject: [PATCH] Fix broken window decorations on unpackaged GNOME instances (#3858) * Fix broken window decorations on unpackaged GNOME instances * Fix CONTRIBUTORS detection * Fix CONTRIBUTORS --- pylib/anki/utils.py | 4 ++++ qt/aqt/__init__.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pylib/anki/utils.py b/pylib/anki/utils.py index b5382e6df..1b4212620 100644 --- a/pylib/anki/utils.py +++ b/pylib/anki/utils.py @@ -248,6 +248,10 @@ is_mac = sys.platform.startswith("darwin") is_win = sys.platform.startswith("win32") # also covers *BSD is_lin = not is_mac and not is_win +is_gnome = ( + "gnome" in os.getenv("XDG_CURRENT_DESKTOP", "").lower() + or "gnome" in os.getenv("DESKTOP_SESSION", "").lower() +) dev_mode = os.getenv("ANKIDEV", "") hmr_mode = os.getenv("HMR", "") diff --git a/qt/aqt/__init__.py b/qt/aqt/__init__.py index af3797049..fb9222521 100644 --- a/qt/aqt/__init__.py +++ b/qt/aqt/__init__.py @@ -59,7 +59,7 @@ from anki._backend import RustBackend from anki.buildinfo import version as _version from anki.collection import Collection from anki.consts import HELP_SITE -from anki.utils import checksum, is_lin, is_mac +from anki.utils import checksum, is_gnome, is_lin, is_mac from aqt import gui_hooks from aqt.log import setup_logging from aqt.qt import * @@ -614,7 +614,7 @@ def _run(argv: list[str] | None = None, exec: bool = True) -> AnkiApp | None: ) wayland_forced = os.getenv("ANKI_WAYLAND") - if packaged and wayland_configured: + if (packaged or is_gnome) and wayland_configured: if wayland_forced or not x11_available: # Work around broken fractional scaling in Wayland # https://bugreports.qt.io/browse/QTBUG-113574