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

css: Make color lookup handle dependencies

Browse Source
This commit is contained in:
Benjamin Otte
2012-08-27 17:27:06 +02:00
parent 27fd3fdf81
commit 11d0f9e408
6 changed files with 75 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkcssstylefuncs.c
View File

@ -216,7 +216,7 @@ rgba_value_compute (GtkStyleContext *context,
GValue new_value = G_VALUE_INIT;
GdkRGBA rgba;
if (!_gtk_style_context_resolve_color (context, symbolic, &rgba))
if (!_gtk_style_context_resolve_color (context, symbolic, &rgba, NULL))
rgba = white;
g_value_init (&new_value, GDK_TYPE_RGBA);
@ -290,7 +290,8 @@ color_value_compute (GtkStyleContext *context,
if (_gtk_style_context_resolve_color (context,
g_value_get_boxed (value),
&rgba))
&rgba,
NULL))
{
color.red = rgba.red * 65535. + 0.5;
color.green = rgba.green * 65535. + 0.5;