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

shorthand: use array values for shorthand properties parsing

Browse Source 
Right now, just parse the first value in the array.
This commit is contained in:
Cosimo Cecchi 2012-05-11 14:30:07 -04:00
parent 8aec81333d
commit cfc5854068
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkcssshorthandpropertyimpl.c
View File

@ -459,6 +459,8 @@ parse_background (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser) GtkCssParser *parser)
{ {
GtkCssValue *value;
do do
{ {
/* the image part */ /* the image part */
@ -477,27 +479,34 @@ parse_background (GtkCssShorthandProperty *shorthand,
return FALSE; 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 && 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) && 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) if (values[2] == NULL)
{ {
values[2] = values[3]; values[2] = values[3];
values[3] = NULL; values[3] = NULL;
} }
value = NULL;
} }
else if (values[4] == NULL) else if (values[4] == NULL)
{ {
values[4] = _gtk_css_symbolic_value_new (parser); value = _gtk_css_symbolic_value_new (parser);
if (values[4] == NULL) if (value == NULL)
return FALSE; return FALSE;
values[4] = _gtk_css_array_value_new (value);
value = NULL;
} }
else else
{ {