diff --git a/gtk/gtkcssstyleproperty.c b/gtk/gtkcssstyleproperty.c index 1590ed28ae..5f99a1bc68 100644 --- a/gtk/gtkcssstyleproperty.c +++ b/gtk/gtkcssstyleproperty.c @@ -39,6 +39,7 @@ enum { PROP_0, PROP_ANIMATED, + PROP_AFFECTS, PROP_AFFECTS_SIZE, PROP_AFFECTS_FONT, PROP_ID, @@ -84,6 +85,9 @@ gtk_css_style_property_set_property (GObject *object, case PROP_ANIMATED: property->animated = g_value_get_boolean (value); break; + case PROP_AFFECTS: + property->affects = g_value_get_flags (value); + break; case PROP_AFFECTS_SIZE: property->affects_size = g_value_get_boolean (value); break; @@ -116,6 +120,9 @@ gtk_css_style_property_get_property (GObject *object, case PROP_ANIMATED: g_value_set_boolean (value, property->animated); break; + case PROP_AFFECTS: + g_value_set_flags (value, property->affects); + break; case PROP_AFFECTS_SIZE: g_value_set_boolean (value, property->affects_size); break; @@ -224,6 +231,14 @@ _gtk_css_style_property_class_init (GtkCssStylePropertyClass *klass) P_("Set if the value can be animated"), FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (object_class, + PROP_AFFECTS, + g_param_spec_flags ("affects", + P_("Affects"), + P_("Set if the value affects the sizing of elements"), + GTK_TYPE_CSS_AFFECTS, + 0, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (object_class, PROP_AFFECTS_SIZE, g_param_spec_boolean ("affects-size", @@ -367,6 +382,23 @@ _gtk_css_style_property_is_animated (GtkCssStyleProperty *property) return property->animated; } +/** + * _gtk_css_style_property_get_affects: + * @property: the property + * + * Returns all the things this property affects. See @GtkCssAffects for what + * the flags mean. + * + * Returns: The things this property affects. + **/ +GtkCssAffects +_gtk_css_style_property_get_affects (GtkCssStyleProperty *property) +{ + g_return_val_if_fail (GTK_IS_CSS_STYLE_PROPERTY (property), 0); + + return property->affects; +} + /** * _gtk_css_style_property_affects_size: * @property: the property diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index 9f6b48192d..d1ce9725cd 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -91,6 +91,7 @@ gtk_css_style_property_register (const char * name, node = g_object_new (GTK_TYPE_CSS_STYLE_PROPERTY, "value-type", value_type, + "affects", affects, "affects-size", (affects & (GTK_CSS_AFFECTS_CLIP | GTK_CSS_AFFECTS_SIZE)) ? TRUE : FALSE, "affects-font", (affects & GTK_CSS_AFFECTS_FONT) ? TRUE : FALSE, "animated", (flags & GTK_STYLE_PROPERTY_ANIMATED) ? TRUE : FALSE, diff --git a/gtk/gtkcssstylepropertyprivate.h b/gtk/gtkcssstylepropertyprivate.h index fb851899eb..bd72bc9676 100644 --- a/gtk/gtkcssstylepropertyprivate.h +++ b/gtk/gtkcssstylepropertyprivate.h @@ -47,6 +47,7 @@ struct _GtkCssStyleProperty GtkCssValue *initial_value; guint id; + GtkCssAffects affects; guint inherit :1; guint animated :1; guint affects_size :1; @@ -73,6 +74,7 @@ GtkCssStyleProperty * _gtk_css_style_property_lookup_by_id (guint gboolean _gtk_css_style_property_is_inherit (GtkCssStyleProperty *property); gboolean _gtk_css_style_property_is_animated (GtkCssStyleProperty *property); +GtkCssAffects _gtk_css_style_property_get_affects (GtkCssStyleProperty *property); gboolean _gtk_css_style_property_affects_size (GtkCssStyleProperty *property); gboolean _gtk_css_style_property_affects_font (GtkCssStyleProperty *property); guint _gtk_css_style_property_get_id (GtkCssStyleProperty *property); diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h index b586623185..1f96f7d7bb 100644 --- a/gtk/gtkcsstypesprivate.h +++ b/gtk/gtkcsstypesprivate.h @@ -96,7 +96,7 @@ typedef enum /*< skip >*/ { * * Note that multiple values can be set. */ -typedef enum /*< skip >*/ { +typedef enum { GTK_CSS_AFFECTS_FOREGROUND = (1 << 0), GTK_CSS_AFFECTS_BACKGROUND = (1 << 1), GTK_CSS_AFFECTS_BORDER = (1 << 2),