summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2015-11-20 20:25:33 -0500
committerMatthias Clasen <mclasen@redhat.com>2015-11-20 20:35:39 -0500
commit5f73e8a7201158aa9a378806fe381435abc87a3b (patch)
tree04d4c9453215e4d587fb811d6c34d29d40fd7580
parentf3e4e8660d5f55b29015e4358d09440189f82b99 (diff)
downloadgtk+-5f73e8a7201158aa9a378806fe381435abc87a3b.tar.gz
Rename the icon-shadow property
This is not a standard CSS property, so rename it to -gtk-icon-shadow. We still support the old name, with a deprecation warning.
-rw-r--r--gtk/gtkcssprovider.c4
-rw-r--r--gtk/gtkcssstylepropertyimpl.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 60a9d3b9ae..8d1ebd085a 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1048,11 +1048,11 @@
* - The optional blur radius is parsed, but it is currently not
* rendered by the GTK+ theming engine.
*
- * To set a shadow on an icon, use the `icon-shadow` property instead,
+ * To set a shadow on an icon, use the `-gtk-icon-shadow` property instead,
* with the same syntax.
*
* To set multiple shadows on an element, you can specify a comma-separated list
- * of shadow elements in the `text-shadow` or `icon-shadow` property. Shadows are
+ * of shadow elements in the `text-shadow` or `-gtk-icon-shadow` property. Shadows are
* always rendered front to back (i.e. the first shadow specified is on top of the
* others). Shadows can thus overlay each other, but they can never overlay the
* text or icon itself, which is always rendered on top of the shadow layer.
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 9dd95b3e69..793c6d9d07 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -97,7 +97,7 @@ gtk_css_style_property_register (const char * name,
"initial-value", initial_value,
"name", name,
NULL);
-
+
node->parse_value = parse_value;
node->query_value = query_value;
node->assign_value = assign_value;
@@ -1570,7 +1570,7 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
_gtk_css_image_value_new (gtk_css_image_builtin_new ()));
- gtk_css_style_property_register ("icon-shadow",
+ gtk_css_style_property_register ("-gtk-icon-shadow",
GTK_CSS_PROPERTY_ICON_SHADOW,
G_TYPE_NONE,
GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
@@ -1579,6 +1579,7 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
_gtk_css_shadows_value_new_none ());
+ _gtk_style_property_add_alias ("-gtk-icon-shadow", "icon-shadow");
gtk_css_style_property_register ("-gtk-icon-style",
GTK_CSS_PROPERTY_ICON_STYLE,
G_TYPE_NONE,