diff options
| author | Benjamin Otte <otte@redhat.com> | 2015-01-19 17:09:42 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-01-20 06:30:19 +0100 |
| commit | 9ce8ce119853635692139a13c3b85602696486ef (patch) | |
| tree | db95238a1b7591c7a290535f080cd8363a1184f8 /gtk/gtkcssstylepropertyimpl.c | |
| parent | fe028e27899e818f84bb007a44b83802a97ef071 (diff) | |
| download | gtk+-9ce8ce119853635692139a13c3b85602696486ef.tar.gz | |
css: Move icon properties to the end
The order in which properties are defined depends on the order in which
they are computed. And that means that properties can only depend on
other properties that are defined before them.
The next patches will need this reordering.
Diffstat (limited to 'gtk/gtkcssstylepropertyimpl.c')
| -rw-r--r-- | gtk/gtkcssstylepropertyimpl.c | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index 467d22202f..bc40a06357 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -1041,43 +1041,6 @@ _gtk_css_style_property_init_properties (void) NULL, _gtk_css_shadows_value_new_none ()); - gtk_css_style_property_register ("-gtk-icon-source", - GTK_CSS_PROPERTY_ICON_SOURCE, - G_TYPE_NONE, - GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_ICON, - css_image_value_parse_with_builtin, - NULL, - NULL, - _gtk_css_image_value_new (gtk_css_image_builtin_new ())); - gtk_css_style_property_register ("icon-shadow", - GTK_CSS_PROPERTY_ICON_SHADOW, - G_TYPE_NONE, - GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_CLIP, - shadow_value_parse, - NULL, - NULL, - _gtk_css_shadows_value_new_none ()); - gtk_css_style_property_register ("-gtk-icon-style", - GTK_CSS_PROPERTY_ICON_STYLE, - G_TYPE_NONE, - GTK_STYLE_PROPERTY_INHERIT, - GTK_CSS_AFFECTS_ICON, - icon_style_parse, - NULL, - NULL, - _gtk_css_icon_style_value_new (GTK_CSS_ICON_STYLE_REQUESTED)); - gtk_css_style_property_register ("-gtk-icon-transform", - GTK_CSS_PROPERTY_ICON_TRANSFORM, - G_TYPE_NONE, - GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_CLIP, - transform_value_parse, - NULL, - NULL, - _gtk_css_transform_value_new_none ()); - gtk_css_style_property_register ("box-shadow", GTK_CSS_PROPERTY_BOX_SHADOW, G_TYPE_NONE, @@ -1495,6 +1458,43 @@ _gtk_css_style_property_init_properties (void) _gtk_css_number_value_new (1, GTK_CSS_NUMBER), _gtk_css_number_value_new (1, GTK_CSS_NUMBER))); + gtk_css_style_property_register ("-gtk-icon-source", + GTK_CSS_PROPERTY_ICON_SOURCE, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED, + GTK_CSS_AFFECTS_ICON, + css_image_value_parse_with_builtin, + NULL, + NULL, + _gtk_css_image_value_new (gtk_css_image_builtin_new ())); + gtk_css_style_property_register ("icon-shadow", + GTK_CSS_PROPERTY_ICON_SHADOW, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED, + GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_CLIP, + shadow_value_parse, + NULL, + NULL, + _gtk_css_shadows_value_new_none ()); + gtk_css_style_property_register ("-gtk-icon-style", + GTK_CSS_PROPERTY_ICON_STYLE, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_INHERIT, + GTK_CSS_AFFECTS_ICON, + icon_style_parse, + NULL, + NULL, + _gtk_css_icon_style_value_new (GTK_CSS_ICON_STYLE_REQUESTED)); + gtk_css_style_property_register ("-gtk-icon-transform", + GTK_CSS_PROPERTY_ICON_TRANSFORM, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED, + GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_CLIP, + transform_value_parse, + NULL, + NULL, + _gtk_css_transform_value_new_none ()); + gtk_css_style_property_register ("transition-property", GTK_CSS_PROPERTY_TRANSITION_PROPERTY, G_TYPE_NONE, |