AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

css: 'transparent' is a valid color everywhere

Browse Source
This commit is contained in:
Benjamin Otte 2011-12-31 23:20:44 +01:00
parent 36e1bcac3c
commit f5fafb18c9
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkcssparser.c
View File

@ -831,6 +831,13 @@ _gtk_css_parser_read_symbolic_color (GtkCssParser *parser)
g_return_val_if_fail (GTK_IS_CSS_PARSER (parser), NULL);
if (_gtk_css_parser_try (parser, "transparent", TRUE))
{
GdkRGBA transparent = { 0, 0, 0, 0 };
return gtk_symbolic_color_new_literal (&transparent);
}
if (_gtk_css_parser_try (parser, "@", FALSE))
{
name = _gtk_css_parser_try_name (parser, TRUE);

27
gtk/gtkstyleproperty.c
View File

@ -1593,23 +1593,6 @@ border_corner_radius_value_print (const GValue *value,
}
}
static gboolean
transparent_color_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value)
{
if (_gtk_css_parser_try (parser, "transparent", TRUE))
{
GdkRGBA transparent = { 0, 0, 0, 0 };
g_value_set_boxed (value, &transparent);
return TRUE;
}
return rgba_value_parse (parser, base, value);
}
/*** API ***/
static void
@ -2121,7 +2104,7 @@ gtk_style_property_init_properties (void)
GDK_TYPE_RGBA, 0),
0,
NULL,
transparent_color_value_parse,
NULL,
NULL,
&value);
g_value_unset (&value);
@ -2331,7 +2314,7 @@ gtk_style_property_init_properties (void)
GDK_TYPE_RGBA, 0),
0,
NULL,
transparent_color_value_parse,
NULL,
NULL,
&value);
_gtk_style_property_register (g_param_spec_boxed ("border-right-color",
@ -2340,7 +2323,7 @@ gtk_style_property_init_properties (void)
GDK_TYPE_RGBA, 0),
0,
NULL,
transparent_color_value_parse,
NULL,
NULL,
&value);
_gtk_style_property_register (g_param_spec_boxed ("border-bottom-color",
@ -2349,7 +2332,7 @@ gtk_style_property_init_properties (void)
GDK_TYPE_RGBA, 0),
0,
NULL,
transparent_color_value_parse,
NULL,
NULL,
&value);
_gtk_style_property_register (g_param_spec_boxed ("border-left-color",
@ -2358,7 +2341,7 @@ gtk_style_property_init_properties (void)
GDK_TYPE_RGBA, 0),
0,
NULL,
transparent_color_value_parse,
NULL,
NULL,
&value);
g_value_unset (&value);