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

symboliccolor: Treat it as a CssValue

Browse Source 
.. now that it is one.
This commit is contained in:
Benjamin Otte
2012-04-07 06:18:03 +02:00
parent 0048c8baf5
commit 0111b9d507
14 changed files with 68 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkcssshadowvalue.c
View File

@ -234,13 +234,10 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser)
}
else if (values[COLOR] == NULL)
{
GtkSymbolicColor *symbolic;
values[COLOR] = _gtk_css_symbolic_value_new (parser);
symbolic = _gtk_css_parser_read_symbolic_color (parser);
if (symbolic == NULL)
if (values[COLOR] == NULL)
goto fail;
values[COLOR] = _gtk_css_value_new_take_symbolic_color (symbolic);
}
else
{
@ -253,7 +250,7 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser)
while (values[HOFFSET] == NULL || !value_is_done_parsing (parser));
if (values[COLOR] == NULL)
values[COLOR] = _gtk_css_value_new_take_symbolic_color (
values[COLOR] = _gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ()));
@ -278,7 +275,7 @@ _gtk_css_shadow_value_compute (GtkCssValue *shadow,
GtkCssValue *color;
color = _gtk_css_rgba_value_compute_from_symbolic (shadow->color,
_gtk_css_value_new_take_symbolic_color (
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())),
context,