summaryrefslogtreecommitdiff
path: root/gtk/gtkcssstylepropertyimpl.c
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2012-05-10 10:25:33 -0400
committerCosimo Cecchi <cosimoc@gnome.org>2012-05-15 13:24:40 -0400
commitf8e6e272a7b724079e3a660e009dfb20a30d5c4b (patch)
treea33f2b64743c9e33a7e89978e2d08c14ac450c74 /gtk/gtkcssstylepropertyimpl.c
parent861c57e3043229e769a45d7349b6e71d99c752de (diff)
downloadgtk+-f8e6e272a7b724079e3a660e009dfb20a30d5c4b.tar.gz
styleproperty: make background-clip and background-area array properties
Right now just make them arrays, but don't consider values after the first.
Diffstat (limited to 'gtk/gtkcssstylepropertyimpl.c')
-rw-r--r--gtk/gtkcssstylepropertyimpl.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 0a642f0065..cde6ee5117 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -412,8 +412,7 @@ assign_border_style (GtkCssStyleProperty *property,
}
static GtkCssValue *
-parse_css_area (GtkCssStyleProperty *property,
- GtkCssParser *parser)
+parse_css_area_one (GtkCssParser *parser)
{
GtkCssValue *value = _gtk_css_area_value_try_parse (parser);
@@ -424,6 +423,13 @@ parse_css_area (GtkCssStyleProperty *property,
}
static GtkCssValue *
+parse_css_area (GtkCssStyleProperty *property,
+ GtkCssParser *parser)
+{
+ return _gtk_css_array_value_parse (parser, parse_css_area_one, FALSE);
+}
+
+static GtkCssValue *
bindings_value_parse_one (GtkCssParser *parser)
{
char *name;
@@ -1253,7 +1259,7 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- _gtk_css_area_value_new (GTK_CSS_AREA_BORDER_BOX));
+ _gtk_css_array_value_new (_gtk_css_area_value_new (GTK_CSS_AREA_BORDER_BOX)));
gtk_css_style_property_register ("background-origin",
GTK_CSS_PROPERTY_BACKGROUND_ORIGIN,
G_TYPE_NONE,
@@ -1263,7 +1269,7 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- _gtk_css_area_value_new (GTK_CSS_AREA_PADDING_BOX));
+ _gtk_css_array_value_new (_gtk_css_area_value_new (GTK_CSS_AREA_PADDING_BOX)));
gtk_css_style_property_register ("background-size",
GTK_CSS_PROPERTY_BACKGROUND_SIZE,
G_TYPE_NONE,