diff options
| -rw-r--r-- | gtk/gtkcssstylepropertyimpl.c | 74 | ||||
| -rw-r--r-- | gtk/gtkcsstypesprivate.h | 8 |
2 files changed, 41 insertions, 41 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, diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h index a9796cc9e7..88bc6f647a 100644 --- a/gtk/gtkcsstypesprivate.h +++ b/gtk/gtkcsstypesprivate.h @@ -118,10 +118,6 @@ enum { /*< skip >*/ GTK_CSS_PROPERTY_FONT_WEIGHT, GTK_CSS_PROPERTY_FONT_STRETCH, GTK_CSS_PROPERTY_TEXT_SHADOW, - GTK_CSS_PROPERTY_ICON_SOURCE, - GTK_CSS_PROPERTY_ICON_SHADOW, - GTK_CSS_PROPERTY_ICON_STYLE, - GTK_CSS_PROPERTY_ICON_TRANSFORM, GTK_CSS_PROPERTY_BOX_SHADOW, GTK_CSS_PROPERTY_MARGIN_TOP, GTK_CSS_PROPERTY_MARGIN_LEFT, @@ -165,6 +161,10 @@ enum { /*< skip >*/ GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT, GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE, GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH, + GTK_CSS_PROPERTY_ICON_SOURCE, + GTK_CSS_PROPERTY_ICON_SHADOW, + GTK_CSS_PROPERTY_ICON_STYLE, + GTK_CSS_PROPERTY_ICON_TRANSFORM, GTK_CSS_PROPERTY_TRANSITION_PROPERTY, GTK_CSS_PROPERTY_TRANSITION_DURATION, GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION, |