callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also look in system data dirs for themes

Browse Source 
With this change, we now look in
$XDG_DATA_HOME/themes/THEME/gtk-3.x
$HOME/.themes/THEME/gtk-3.x
$XDG_DATA_DIRS/themes/THEME/gtk-3.x
GTK_DATA_PREFIX/themes/THEME/gtk-3.x

https://bugzilla.gnome.org/show_bug.cgi?id=641354
This commit is contained in:
Matthias Clasen
2016-03-17 00:32:53 -04:00
parent c48bc48dda
commit 475d916eb9
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkcssprovider.c
View File

@ -61,12 +61,15 @@
* gtk_style_context_add_provider_for_screen(). * gtk_style_context_add_provider_for_screen().
* In addition, certain files will be read when GTK+ is initialized. First, the * In addition, certain files will be read when GTK+ is initialized. First, the
* file $XDG_CONFIG_HOME/gtk-3.0/gtk.css` is loaded if it exists. Then, GTK+ tries * file $XDG_CONFIG_HOME/gtk-3.0/gtk.css` is loaded if it exists. Then, GTK+
* to load `$HOME/.themes/theme-name/gtk-3.0/gtk.css`, falling back to * loads the first existing file among
* `XDG_DATA_HOME/themes/theme-name/gtk-VERSION/gtk.css`,
* `$HOME/.themes/theme-name/gtk-VERSION/gtk.css`,
* `$XDG_DATA_DIRS/themes/theme-name/gtk-VERSION/gtk.css` and
* `DATADIR/share/themes/THEME/gtk-VERSION/gtk.css`, where THEME is the name of * `DATADIR/share/themes/THEME/gtk-VERSION/gtk.css`, where THEME is the name of
* the current theme (see the #GtkSettings:gtk-theme-name setting), DATADIR * the current theme (see the #GtkSettings:gtk-theme-name setting), DATADIR
* is the prefix configured when GTK+ was compiled, unless overridden by the * is the prefix configured when GTK+ was compiled (unless overridden by the
* `GTK_DATA_PREFIX` environment variable, and VERSION is the GTK+ version number. * `GTK_DATA_PREFIX` environment variable), and VERSION is the GTK+ version number.
* If no file is found for the current version, GTK+ tries older versions all the * If no file is found for the current version, GTK+ tries older versions all the
* way back to 3.0. * way back to 3.0.
* *
@ -2056,8 +2059,10 @@ _gtk_css_find_theme (const gchar *name,
{ {
gchar *path; gchar *path;
const gchar *var; const gchar *var;
const char *const *dirs;
int i;
/* First look in the user's config directory */ /* First look in the user's data directory */
path = _gtk_css_find_theme_dir (g_get_user_data_dir (), "themes", name, variant); path = _gtk_css_find_theme_dir (g_get_user_data_dir (), "themes", name, variant);
if (path) if (path)
return path; return path;
@ -2067,6 +2072,15 @@ _gtk_css_find_theme (const gchar *name,
if (path) if (path)
return path; return path;
/* Look in system data directories */
dirs = g_get_system_data_dirs ();
for (i = 0; dirs[i]; i++)
{
path = _gtk_css_find_theme_dir (dirs[i], "themes", name, variant);
if (path)
return path;
}
/* Finally, try in the default theme directory */ /* Finally, try in the default theme directory */
var = g_getenv ("GTK_DATA_PREFIX"); var = g_getenv ("GTK_DATA_PREFIX");
if (!var) if (!var)