[gtk+/wip/multiple-backgrounds: 10/15] shorthand: use array values for shorthand properties parsing
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/multiple-backgrounds: 10/15] shorthand: use array values for shorthand properties parsing
- Date: Mon, 14 May 2012 13:23:58 +0000 (UTC)
commit a000135cbf6702fd7964be7fdc572dde388428fd
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Fri May 11 14:30:07 2012 -0400
shorthand: use array values for shorthand properties parsing
Right now, just parse the first value in the array.
gtk/gtkcssshorthandpropertyimpl.c | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index fdcb2de..bb0d768 100644
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -459,6 +459,8 @@ parse_background (GtkCssShorthandProperty *shorthand,
GtkCssValue **values,
GtkCssParser *parser)
{
+ GtkCssValue *value;
+
do
{
/* the image part */
@@ -477,27 +479,34 @@ parse_background (GtkCssShorthandProperty *shorthand,
return FALSE;
}
- values[0] = _gtk_css_image_value_new (image);
+ values[0] = _gtk_css_array_value_new (_gtk_css_image_value_new (image));
}
else if (values[1] == NULL &&
- (values[1] = _gtk_css_background_repeat_value_try_parse (parser)))
+ (value = _gtk_css_background_repeat_value_try_parse (parser)))
{
- /* nothing to do here */
+ values[1] = _gtk_css_array_value_new (value);
+ value = NULL;
}
else if ((values[2] == NULL || values[3] == NULL) &&
- (values[3] = _gtk_css_area_value_try_parse (parser)))
+ (value = _gtk_css_area_value_try_parse (parser)))
{
+ values[3] = _gtk_css_array_value_new (value);
+
if (values[2] == NULL)
{
values[2] = values[3];
values[3] = NULL;
}
+ value = NULL;
}
else if (values[4] == NULL)
{
- values[4] = _gtk_css_symbolic_value_new (parser);
- if (values[4] == NULL)
+ value = _gtk_css_symbolic_value_new (parser);
+ if (value == NULL)
return FALSE;
+
+ values[4] = _gtk_css_array_value_new (value);
+ value = NULL;
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]