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

GtkSymbolicColor: Only require styleproperties when resolving named colors.

Browse Source 
It is not necessary for resolving colors based on literals,
so be a bit less strict here.
This commit is contained in:
Carlos Garnacho 2010-11-06 12:36:05 +01:00
parent 525963d74d
commit 765f653df6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtksymboliccolor.c
View File

@ -488,7 +488,6 @@ gtk_symbolic_color_resolve (GtkSymbolicColor *color,
GdkRGBA *resolved_color) GdkRGBA *resolved_color)
{ {
g_return_val_if_fail (color != NULL, FALSE); g_return_val_if_fail (color != NULL, FALSE);
g_return_val_if_fail (GTK_IS_STYLE_PROPERTIES (props), FALSE);
g_return_val_if_fail (resolved_color != NULL, FALSE); g_return_val_if_fail (resolved_color != NULL, FALSE);
switch (color->type) switch (color->type)
@ -500,6 +499,8 @@ gtk_symbolic_color_resolve (GtkSymbolicColor *color,
{ {
GtkSymbolicColor *named_color; GtkSymbolicColor *named_color;
g_return_val_if_fail (GTK_IS_STYLE_PROPERTIES (props), FALSE);
named_color = gtk_style_properties_lookup_color (props, color->name); named_color = gtk_style_properties_lookup_color (props, color->name);
if (!named_color) if (!named_color)