[gtk+] cssprovider: Change location of builtin themes
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] cssprovider: Change location of builtin themes
- Date: Thu, 4 Feb 2016 12:37:33 +0000 (UTC)
commit d0fd7990c3f2c738f86185418ccd76b14da8a776
Author: Benjamin Otte <otte redhat com>
Date: Thu Feb 4 13:28:21 2016 +0100
cssprovider: Change location of builtin themes
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.
gtk/Makefile.am | 13 +++++++------
gtk/gtkcssprovider.c | 4 ++--
2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2f10991..6061a75 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1213,10 +1213,10 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc
echo " <gresource prefix='/org/gtk/libgtk'>" >> $@; \
for f in $(srcdir)/theme/Raleigh/*.css; do \
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; \
- echo " <file alias='theme/Adwaita.css'>theme/Adwaita/gtk.css</file>" >> $@; \
- echo " <file alias='theme/Adwaita-dark.css'>theme/Adwaita/gtk-dark.css</file>" >> $@; \
+ echo " <file>theme/Adwaita/gtk.css</file>" >> $@; \
+ echo " <file>theme/Adwaita/gtk-dark.css</file>" >> $@; \
echo " <file>theme/Adwaita/gtk-contained.css</file>" >> $@; \
echo " <file>theme/Adwaita/gtk-contained-dark.css</file>" >> $@; \
for f in $(srcdir)/theme/Adwaita/assets/*.png; do \
@@ -1227,14 +1227,15 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc
n=`basename $$f`; \
echo " <file>theme/Adwaita/assets/$$n</file>" >> $@; \
done; \
- echo " <file alias='theme/HighContrast.css'>theme/HighContrast/gtk.css</file>" >> $@; \
- echo " <file alias='theme/HighContrastInverse.css'>theme/HighContrast/gtk-inverse.css</file>" >>
$@; \
+ echo " <file>theme/HighContrast/gtk.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-inverse.css</file>" >> $@; \
if test "$(win32_theme)" = "yes"; then \
for f in $(srcdir)/theme/win32/*.css; do \
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; \
fi; \
for f in $(srcdir)/cursor/*.png; do \
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 1c192c7..c6481a6 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -2106,9 +2106,9 @@ _gtk_css_provider_load_named (GtkCssProvider *provider,
* themes.
*/
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
- 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))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]