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

GtkCssProvider: Also parse GdkColor values

Browse Source 
This is necessary for widget style properties to work.
This commit is contained in:
Carlos Garnacho 2010-11-13 01:24:07 +01:00
parent 815e3499ae
commit 8b9b9c22e7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkcssprovider.c
View File

@ -2313,12 +2313,18 @@ css_provider_parse_value (GtkCssProvider *css_provider,
type = G_VALUE_TYPE (value);
if (type == GDK_TYPE_RGBA)
if (type == GDK_TYPE_RGBA ||
type == GDK_TYPE_COLOR)
{
GdkRGBA color;
GdkColor rgb;
if (gdk_rgba_parse (&color, value_str) == TRUE)
if (type == GDK_TYPE_RGBA &&
gdk_rgba_parse (&color, value_str))
g_value_set_boxed (value, &color);
else if (type == GDK_TYPE_COLOR &&
gdk_color_parse (value_str, &rgb))
g_value_set_boxed (value, &rgb);
else
{
GtkSymbolicColor *symbolic_color;