AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-06 16:50:11 +00:00
Code Issues Projects Releases Wiki Activity

GtkCssProvider: allow color names from rgb.txt when parsing colors.

Browse Source
This commit is contained in:
Carlos Garnacho 2010-11-12 22:59:21 +01:00
parent 44b1a6c852
commit cb2f9a86e5
1 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
gtk/gtkcssprovider.c
View File

@ -1564,39 +1564,7 @@ symbolic_color_parse_str (const gchar *string,
str = (gchar *) string; str = (gchar *) string;
*end_ptr = str; *end_ptr = str;
if (str[0] == '#' || str[0] == 'r') if (str[0] == '@')
{
GdkRGBA color;
gchar *color_str;
const gchar *end;
end = str + 1;
if (str[0] == '#')
while (g_ascii_isxdigit (*end))
end++;
else
{
while (*end != ')' && *end != '\0')
end++;
if (*end == ')')
end++;
}
color_str = g_strndup (str, end - str);
*end_ptr = (gchar *) end;
if (!gdk_rgba_parse (&color, color_str))
{
g_free (color_str);
return NULL;
}
symbolic_color = gtk_symbolic_color_new_literal (&color);
g_free (color_str);
}
else if (str[0] == '@')
{ {
const gchar *end; const gchar *end;
gchar *name; gchar *name;
@ -1747,6 +1715,48 @@ symbolic_color_parse_str (const gchar *string,
gtk_symbolic_color_unref (color2); gtk_symbolic_color_unref (color2);
(*end_ptr)++; (*end_ptr)++;
} }
else
{
GdkRGBA color;
gchar *color_str;
const gchar *end;
end = str + 1;
if (str[0] == '#')
{
/* Color in hex format */
while (g_ascii_isxdigit (*end))
end++;
}
else if (g_str_has_prefix (str, "rgb"))
{
/* color in rgb/rgba format */
while (*end != ')' && *end != '\0')
end++;
if (*end == ')')
end++;
}
else
{
/* color name? parse until first whitespace */
while (*end != ' ' && *end != '\0')
end++;
}
color_str = g_strndup (str, end - str);
*end_ptr = (gchar *) end;
if (!gdk_rgba_parse (&color, color_str))
{
g_free (color_str);
return NULL;
}
symbolic_color = gtk_symbolic_color_new_literal (&color);
g_free (color_str);
}
return symbolic_color; return symbolic_color;
} }