Prioritize GTK_THEME env variable over GtkSettings

xournalpp · Apr 5, 2024 · fc7052e · fc7052e
1 parent ca027ef
commit fc7052e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/core/gui/MainWindow.cpp b/src/core/gui/MainWindow.cpp
@@ -213,7 +213,13 @@ struct ThemeProperties {
 };
 static ThemeProperties getThemeProperties(GtkWidget* w) {
     xoj::util::OwnedCString name;
-    g_object_get(gtk_widget_get_settings(w), "gtk-theme-name", name.contentReplacer(), nullptr);
+    // Gtk prioritizes GTK_THEME over GtkSettings content
+    // cf https://gitlab.gnome.org/GNOME/gtk/blob/90d84a2af8b367bd5a5312b3fa3b67563462c0ef/gtk/gtksettings.c#L1567-L1622
+    if (auto* p = g_getenv("GTK_THEME")) {
+        *(name.contentReplacer()) = g_strdup(p);
+    } else {
+        g_object_get(gtk_widget_get_settings(w), "gtk-theme-name", name.contentReplacer(), nullptr);
+    }
 
     // Try to figure out if the theme is dark or light
     // Some themes handle their dark variant via "gtk-application-prefer-dark-theme" while other just append "-dark"