summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-04-15 17:08:15 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-04-15 17:09:46 -0400
commit9f6b3e179f4d568cf8fbde0732db27431bc111bd (patch)
treece6a65b7d3fe0c4d458378e9c2ac5074dcc4361b
parent9b7f927b3c54fb65cae66ac1ed31307e8a55c0cf (diff)
downloadgtk+-9f6b3e179f4d568cf8fbde0732db27431bc111bd.tar.gz
themes: Make fallback work a bit bettertheme-fallback-fix
One case we did not include in fd329e0ec582d7562f444b is Adwaita-dark -> Default:dark It turns out that it is needed.
-rw-r--r--gtk/gtkcssprovider.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 56b243f1c1..91e5f6240f 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1384,7 +1384,12 @@ gtk_css_provider_load_named (GtkCssProvider *provider,
}
else
{
- /* Things failed! Fall back! Fall back! */
+ /* Things failed! Fall back! Fall back!
+ *
+ * We accept the names HighContrast, HighContrastInverse,
+ * Adwaita and Adwaita-dark as aliases for the variants
+ * of the Default theme.
+ */
if (strcmp (name, "HighContrast") == 0)
{
if (g_strcmp0 (variant, "dark") == 0)
@@ -1394,6 +1399,8 @@ gtk_css_provider_load_named (GtkCssProvider *provider,
}
else if (strcmp (name, "HighConstrastInverse") == 0)
gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, "hc-dark");
+ else if (strcmp (name, "Adwaita-dark") == 0)
+ gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, "dark");
else if (strcmp (name, DEFAULT_THEME_NAME) != 0)
gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, variant);
else