AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

css: Add GtkCssStyleProperty::affects property

Browse Source
This commit is contained in:
Benjamin Otte 2015-01-27 04:32:09 +01:00
parent 11d70f1ac3
commit c0650057c1
4 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkcssstyleproperty.c
View File

@ -39,6 +39,7 @@
enum { enum {
PROP_0, PROP_0,
PROP_ANIMATED, PROP_ANIMATED,
PROP_AFFECTS,
PROP_AFFECTS_SIZE, PROP_AFFECTS_SIZE,
PROP_AFFECTS_FONT, PROP_AFFECTS_FONT,
PROP_ID, PROP_ID,
@ -84,6 +85,9 @@ gtk_css_style_property_set_property (GObject *object,
case PROP_ANIMATED: case PROP_ANIMATED:
property->animated = g_value_get_boolean (value); property->animated = g_value_get_boolean (value);
break; break;
case PROP_AFFECTS:
property->affects = g_value_get_flags (value);
break;
case PROP_AFFECTS_SIZE: case PROP_AFFECTS_SIZE:
property->affects_size = g_value_get_boolean (value); property->affects_size = g_value_get_boolean (value);
break; break;
@ -116,6 +120,9 @@ gtk_css_style_property_get_property (GObject *object,
case PROP_ANIMATED: case PROP_ANIMATED:
g_value_set_boolean (value, property->animated); g_value_set_boolean (value, property->animated);
break; break;
case PROP_AFFECTS:
g_value_set_flags (value, property->affects);
break;
case PROP_AFFECTS_SIZE: case PROP_AFFECTS_SIZE:
g_value_set_boolean (value, property->affects_size); g_value_set_boolean (value, property->affects_size);
break; break;
@ -224,6 +231,14 @@ _gtk_css_style_property_class_init (GtkCssStylePropertyClass *klass)
P_("Set if the value can be animated"), P_("Set if the value can be animated"),
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); 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, g_object_class_install_property (object_class,
PROP_AFFECTS_SIZE, PROP_AFFECTS_SIZE,
g_param_spec_boolean ("affects-size", g_param_spec_boolean ("affects-size",
@ -367,6 +382,23 @@ _gtk_css_style_property_is_animated (GtkCssStyleProperty *property)
return property->animated; 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: * _gtk_css_style_property_affects_size:
* @property: the property * @property: the property

1
gtk/gtkcssstylepropertyimpl.c
View File

@ -91,6 +91,7 @@ gtk_css_style_property_register (const char * name,
node = g_object_new (GTK_TYPE_CSS_STYLE_PROPERTY, node = g_object_new (GTK_TYPE_CSS_STYLE_PROPERTY,
"value-type", value_type, "value-type", value_type,
"affects", affects,
"affects-size", (affects & (GTK_CSS_AFFECTS_CLIP | GTK_CSS_AFFECTS_SIZE)) ? TRUE : FALSE, "affects-size", (affects & (GTK_CSS_AFFECTS_CLIP | GTK_CSS_AFFECTS_SIZE)) ? TRUE : FALSE,
"affects-font", (affects & GTK_CSS_AFFECTS_FONT) ? TRUE : FALSE, "affects-font", (affects & GTK_CSS_AFFECTS_FONT) ? TRUE : FALSE,
"animated", (flags & GTK_STYLE_PROPERTY_ANIMATED) ? TRUE : FALSE, "animated", (flags & GTK_STYLE_PROPERTY_ANIMATED) ? TRUE : FALSE,

2
gtk/gtkcssstylepropertyprivate.h
View File

@ -47,6 +47,7 @@ struct _GtkCssStyleProperty
GtkCssValue *initial_value; GtkCssValue *initial_value;
guint id; guint id;
GtkCssAffects affects;
guint inherit :1; guint inherit :1;
guint animated :1; guint animated :1;
guint affects_size :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_inherit (GtkCssStyleProperty *property);
gboolean _gtk_css_style_property_is_animated (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_size (GtkCssStyleProperty *property);
gboolean _gtk_css_style_property_affects_font (GtkCssStyleProperty *property); gboolean _gtk_css_style_property_affects_font (GtkCssStyleProperty *property);
guint _gtk_css_style_property_get_id (GtkCssStyleProperty *property); guint _gtk_css_style_property_get_id (GtkCssStyleProperty *property);

2
gtk/gtkcsstypesprivate.h
View File

@ -96,7 +96,7 @@ typedef enum /*< skip >*/ {
* *
* Note that multiple values can be set. * Note that multiple values can be set.
*/ */
typedef enum /*< skip >*/ { typedef enum {
GTK_CSS_AFFECTS_FOREGROUND = (1 << 0), GTK_CSS_AFFECTS_FOREGROUND = (1 << 0),
GTK_CSS_AFFECTS_BACKGROUND = (1 << 1), GTK_CSS_AFFECTS_BACKGROUND = (1 << 1),
GTK_CSS_AFFECTS_BORDER = (1 << 2), GTK_CSS_AFFECTS_BORDER = (1 << 2),