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

cssprovider: Change location of builtin themes

Browse Source 
Instead of
  /org/gtk/libgtk/theme/$THEME-$VARIANT.css
look at
  /org/gtk/libgtk/theme/$THEME/gtk-$VARIANT.css
and that way mirror the directory layout of real themes.
This commit is contained in:
Benjamin Otte
2016-02-04 13:28:21 +01:00
parent 6bc096d748
commit d0fd7990c3
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/Makefile.am
View File

@ -1213,10 +1213,10 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc
echo " <gresource prefix='/org/gtk/libgtk'>" >> $@; \ echo " <gresource prefix='/org/gtk/libgtk'>" >> $@; \
for f in $(srcdir)/theme/Raleigh/*.css; do \ for f in $(srcdir)/theme/Raleigh/*.css; do \
n=`basename $$f`; \ n=`basename $$f`; \
echo " <file alias='theme/Raleigh.css'>theme/Raleigh/$$n</file>" >> $@; \ echo " <file alias='theme/Raleigh/gtk.css'>theme/Raleigh/$$n</file>" >> $@; \
done; \ done; \
echo " <file alias='theme/Adwaita.css'>theme/Adwaita/gtk.css</file>" >> $@; \ echo " <file>theme/Adwaita/gtk.css</file>" >> $@; \
echo " <file alias='theme/Adwaita-dark.css'>theme/Adwaita/gtk-dark.css</file>" >> $@; \ echo " <file>theme/Adwaita/gtk-dark.css</file>" >> $@; \
echo " <file>theme/Adwaita/gtk-contained.css</file>" >> $@; \ echo " <file>theme/Adwaita/gtk-contained.css</file>" >> $@; \
echo " <file>theme/Adwaita/gtk-contained-dark.css</file>" >> $@; \ echo " <file>theme/Adwaita/gtk-contained-dark.css</file>" >> $@; \
for f in $(srcdir)/theme/Adwaita/assets/*.png; do \ for f in $(srcdir)/theme/Adwaita/assets/*.png; do \
@ -1227,14 +1227,15 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc
n=`basename $$f`; \ n=`basename $$f`; \
echo " <file>theme/Adwaita/assets/$$n</file>" >> $@; \ echo " <file>theme/Adwaita/assets/$$n</file>" >> $@; \
done; \ done; \
echo " <file alias='theme/HighContrast.css'>theme/HighContrast/gtk.css</file>" >> $@; \ echo " <file>theme/HighContrast/gtk.css</file>" >> $@; \
echo " <file alias='theme/HighContrastInverse.css'>theme/HighContrast/gtk-inverse.css</file>" >> $@; \ echo " <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file>" >> $@; \
echo " <file>theme/HighContrast/gtk-contained.css</file>" >> $@; \ echo " <file>theme/HighContrast/gtk-contained.css</file>" >> $@; \
echo " <file>theme/HighContrast/gtk-contained-inverse.css</file>" >> $@; \ echo " <file>theme/HighContrast/gtk-contained-inverse.css</file>" >> $@; \
if test "$(win32_theme)" = "yes"; then \ if test "$(win32_theme)" = "yes"; then \
for f in $(srcdir)/theme/win32/*.css; do \ for f in $(srcdir)/theme/win32/*.css; do \
n=`basename $$f`; \ n=`basename $$f`; \
echo " <file alias='theme/$$n'>theme/win32/$$n</file>" >> $@; \ m=`echo $$n | cut -b 5-` \
echo " <file alias='theme/$$m/gtk.css'>theme/win32/$$n</file>" >> $@; \
done; \ done; \
fi; \ fi; \
for f in $(srcdir)/cursor/*.png; do \ for f in $(srcdir)/cursor/*.png; do \

4
gtk/gtkcssprovider.c
View File

@ -2106,9 +2106,9 @@ _gtk_css_provider_load_named (GtkCssProvider *provider,
* themes. * themes.
*/ */
if (variant) if (variant)
resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s-%s.css", name, variant); resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s/gtk-%s.css", name, variant);
else else
resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s.css", name); resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s/gtk.css", name);
if (g_resources_get_info (resource_path, 0, NULL, NULL, NULL)) if (g_resources_get_info (resource_path, 0, NULL, NULL, NULL))
{ {