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

shorthand: fix parsing of currentColor for border-color shorthand

Browse Source 
Code for border-color was missing the currentColor parsing.
This commit is contained in:
Cosimo Cecchi 2012-01-11 17:35:59 -05:00
parent 984834ea57
commit 09b4658c06
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkcssshorthandpropertyimpl.c
View File

@ -158,6 +158,13 @@ parse_border_color (GtkCssShorthandProperty *shorthand,
guint i; guint i;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{
if (_gtk_css_parser_try (parser, "currentcolor", TRUE))
{
g_value_init (&values[i], GTK_TYPE_CSS_SPECIAL_VALUE);
g_value_set_enum (&values[i], GTK_CSS_CURRENT_COLOR);
}
else
{ {
symbolic = _gtk_css_parser_read_symbolic_color (parser); symbolic = _gtk_css_parser_read_symbolic_color (parser);
if (symbolic == NULL) if (symbolic == NULL)
@ -165,6 +172,7 @@ parse_border_color (GtkCssShorthandProperty *shorthand,
g_value_init (&values[i], GTK_TYPE_SYMBOLIC_COLOR); g_value_init (&values[i], GTK_TYPE_SYMBOLIC_COLOR);
g_value_set_boxed (&values[i], symbolic); g_value_set_boxed (&values[i], symbolic);
}
if (value_is_done_parsing (parser)) if (value_is_done_parsing (parser))
break; break;
@ -172,7 +180,7 @@ parse_border_color (GtkCssShorthandProperty *shorthand,
for (i++; i < 4; i++) for (i++; i < 4; i++)
{ {
g_value_init (&values[i], GTK_TYPE_SYMBOLIC_COLOR); g_value_init (&values[i], G_VALUE_TYPE (&values[(i - 1) >> 1]));
g_value_copy (&values[(i - 1) >> 1], &values[i]); g_value_copy (&values[(i - 1) >> 1], &values[i]);
} }