callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

styleproperty: Parse all values for background-repeat

Browse Source 
... and its component in the background property.
This commit is contained in:
Benjamin Otte
2012-01-05 02:48:32 +01:00
parent 77af93bad9
commit bc9373fb43
3 changed files with 104 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkcssshorthandpropertyimpl.c
View File

@ -307,6 +307,24 @@ parse_background (GtkCssShorthandProperty *shorthand,
else if (!G_IS_VALUE (&values[1]) &&
_gtk_css_parser_try_enum (parser, GTK_TYPE_CSS_BACKGROUND_REPEAT, &enum_value))
{
if (enum_value <= GTK_CSS_BACKGROUND_REPEAT_MASK)
{
int vertical;
if (_gtk_css_parser_try_enum (parser, GTK_TYPE_CSS_BACKGROUND_REPEAT, &vertical))
{
if (vertical >= GTK_CSS_BACKGROUND_REPEAT_MASK)
{
_gtk_css_parser_error (parser, "Not a valid 2nd value for border-repeat");
return FALSE;
}
else
enum_value |= vertical << GTK_CSS_BACKGROUND_REPEAT_SHIFT;
}
else
enum_value |= enum_value << GTK_CSS_BACKGROUND_REPEAT_SHIFT;
}
g_value_init (&values[1], GTK_TYPE_CSS_BACKGROUND_REPEAT);
g_value_set_enum (&values[1], enum_value);
}