]> Pileus Git - ~andy/gtk/commitdiff
css: Create SymbolicColor fallback properties for colors
authorBenjamin Otte <otte@redhat.com>
Sat, 14 Jan 2012 03:18:29 +0000 (04:18 +0100)
committerBenjamin Otte <otte@redhat.com>
Thu, 2 Feb 2012 02:13:38 +0000 (03:13 +0100)
gtk/gtkcsscustomproperty.c

index 266544be4866f01e63eac55489c8b63f8bdcb157..fcb8a0f9c7202d2fb2ac4617698db89aeb0d8a02 100644 (file)
@@ -77,21 +77,32 @@ _gtk_css_custom_property_init (GtkCssCustomProperty *custom_property)
 {
 }
 
+static GType
+gtk_css_custom_property_get_specified_type (GParamSpec *pspec)
+{
+  if (pspec->value_type == GDK_TYPE_RGBA ||
+      pspec->value_type == GDK_TYPE_COLOR)
+    return GTK_TYPE_SYMBOLIC_COLOR;
+  else
+    return pspec->value_type;
+}
+
 static void
 gtk_css_custom_property_create_initial_value (GParamSpec *pspec,
                                               GValue     *value)
 {
-  g_value_init (value, pspec->value_type);
+  g_value_init (value, gtk_css_custom_property_get_specified_type (pspec));
 
   if (pspec->value_type == GTK_TYPE_THEMING_ENGINE)
     g_value_set_object (value, gtk_theming_engine_load (NULL));
   else if (pspec->value_type == PANGO_TYPE_FONT_DESCRIPTION)
     g_value_take_boxed (value, pango_font_description_from_string ("Sans 10"));
-  else if (pspec->value_type == GDK_TYPE_RGBA)
+  else if (pspec->value_type == GDK_TYPE_RGBA ||
+           pspec->value_type == GDK_TYPE_COLOR)
     {
       GdkRGBA color;
       gdk_rgba_parse (&color, "pink");
-      g_value_set_boxed (value, &color);
+      g_value_take_boxed (value, gtk_symbolic_color_new_literal (&color));
     }
   else if (pspec->value_type == GTK_TYPE_BORDER)
     {