commit 59896d588b0eb39f2579ce10183f48898894887a parent 7168384b9a862843132fa8524303ecd18808c086 Author: Emilio Cobos Álvarez <emilio@crisal.io> Date: Thu, 9 Oct 2025 19:02:39 +0000 Bug 1993479 - Use gtk settings to override gtk theme. r=jcristau The GTK environment variable prevents us from switching color scheme at runtime. Differential Revision: https://phabricator.services.mozilla.com/D268170 Diffstat:
| M | layout/tools/reftest/runreftest.py | | | 3 | --- |
| M | taskcluster/docker/recipes/ubuntu2404-test-system-setup-base.sh | | | 9 | +++++++++ |
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py @@ -540,9 +540,6 @@ class RefTest: browserEnv["TZ"] = "PST8PDT" browserEnv["LC_ALL"] = "en_US.UTF-8" - # This should help with consistency - browserEnv["GTK_THEME"] = "Adwaita" - for v in options.environment: ix = v.find("=") if ix <= 0: diff --git a/taskcluster/docker/recipes/ubuntu2404-test-system-setup-base.sh b/taskcluster/docker/recipes/ubuntu2404-test-system-setup-base.sh @@ -169,4 +169,13 @@ rm -rf /run/systemd/seats # Further cleanup apt-get autoremove --purge +# Overwrite Ubuntu's Yaru theme with GTK's default (Adwaita), for consistency +cat > /etc/gtk-3.0/settings.ini <<EOF +[Settings] +gtk-theme-name = Adwaita +gtk-icon-theme-name = Yaru +gtk-sound-theme-name = Yaru +gtk-icon-sizes = panel-menu-bar=24,24 +EOF + rm -f "$0"