diff options
| author | lukefromdc <[email protected]> | 2016-12-07 02:12:19 -0500 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2016-12-07 02:12:19 -0500 |
| commit | 0b2858d6a87bf0c1283f333678757a55b11681fa (patch) | |
| tree | fb69d9479f73a301be86caf2a14c3a4188dd09cd /src | |
| parent | d4b1410d09ee707537fc2618a434f61f3880df5d (diff) | |
| download | caja-0b2858d6a87bf0c1283f333678757a55b11681fa.tar.bz2 caja-0b2858d6a87bf0c1283f333678757a55b11681fa.tar.xz | |
Rename labels: follow theme if available, sane default
Fixes https://github.com/mate-desktop/caja/issues/688
*Split caja.css. Much of it can load with GTK_STYLE_PROVIDER_PRIORITY_THEME to allow themes that support Caja to set their own style. CSS required for the desktop background to show and to keep the white text suitable for most backgrounds needs GTK_STYLE_PROVIDER_PRIORITY_APPLICATION so it is loaded separately from new file caja-desktop.css
*Move all css items that must not be overridden by themes (most of them are for the desktop) to caja-desktop.css and keep those that are only needed when themes do not set them at all in caja.css
Diffstat (limited to 'src')
| -rw-r--r-- | src/caja-application.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/caja-application.c b/src/caja-application.c index b179643f..e6c607fd 100644 --- a/src/caja-application.c +++ b/src/caja-application.c @@ -1022,17 +1022,32 @@ init_css (void) GtkCssProvider *provider; GError *error = NULL; + /* add our custom CSS provider */ provider = gtk_css_provider_new (); gtk_css_provider_load_from_path (provider, CAJA_DATADIR G_DIR_SEPARATOR_S "caja.css", &error); if (error != NULL) { - g_warning ("Failed to load application css file: %s", error->message); - g_error_free (error); + g_warning ("Can't parse Caja' CSS custom description: %s\n", error->message); + g_error_free (error); + } else { + gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), + GTK_STYLE_PROVIDER (provider), + GTK_STYLE_PROVIDER_PRIORITY_THEME); + } + +/* add our desktop CSS provider, ensures the desktop background does not get covered */ + provider = gtk_css_provider_new (); + gtk_css_provider_load_from_path (provider, + CAJA_DATADIR G_DIR_SEPARATOR_S "caja-desktop.css", &error); + + if (error != NULL) { + g_warning ("Can't parse Caja' CSS custom description: %s\n", error->message); + g_error_free (error); } else { - gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), - GTK_STYLE_PROVIDER (provider), - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), + GTK_STYLE_PROVIDER (provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); } g_object_unref (provider); |