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

Support resetting cell renderer colors with NULL again

Browse Source 
This functionality was lost when GdkRGBA was introduced.

Bug 632936
This commit is contained in:
Matthias Clasen 2010-10-25 11:17:24 -04:00
parent 546be63ecc
commit 503698f587
2 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gtk/gtkcellrenderer.c
View File

@ -493,28 +493,36 @@ gtk_cell_renderer_set_property (GObject *object,
{ {
GdkRGBA rgba; GdkRGBA rgba;
if (!g_value_get_string (value)) if (!g_value_get_string (value))
set_cell_bg_color (cell, NULL); set_cell_bg_color (cell, NULL);
else if (gdk_rgba_parse (g_value_get_string (value), &rgba)) else if (gdk_rgba_parse (g_value_get_string (value), &rgba))
set_cell_bg_color (cell, &rgba); set_cell_bg_color (cell, &rgba);
else else
g_warning ("Don't know color `%s'", g_value_get_string (value)); g_warning ("Don't know color `%s'", g_value_get_string (value));
g_object_notify (object, "cell-background-gdk"); g_object_notify (object, "cell-background-gdk");
} }
break; break;
case PROP_CELL_BACKGROUND_GDK: case PROP_CELL_BACKGROUND_GDK:
{ {
GdkColor *color; GdkColor *color;
GdkRGBA rgba;
color = g_value_get_boxed (value); color = g_value_get_boxed (value);
rgba.red = color->red / 65535.; if (color)
rgba.green = color->green / 65535.; {
rgba.blue = color->blue / 65535.; GdkRGBA rgba;
rgba.alpha = 1;
set_cell_bg_color (cell, &rgba); rgba.red = color->red / 65535.;
rgba.green = color->green / 65535.;
rgba.blue = color->blue / 65535.;
rgba.alpha = 1;
set_cell_bg_color (cell, &rgba);
}
else
{
set_cell_bg_color (cell, NULL);
}
} }
break; break;
case PROP_CELL_BACKGROUND_RGBA: case PROP_CELL_BACKGROUND_RGBA:
@ -539,9 +547,9 @@ set_cell_bg_color (GtkCellRenderer *cell,
{ {
if (!priv->cell_background_set) if (!priv->cell_background_set)
{ {
priv->cell_background_set = TRUE; priv->cell_background_set = TRUE;
g_object_notify (G_OBJECT (cell), "cell-background-set"); g_object_notify (G_OBJECT (cell), "cell-background-set");
} }
priv->cell_background = *rgba; priv->cell_background = *rgba;
} }

38
gtk/gtkcellrenderertext.c
View File

@ -1206,28 +1206,46 @@ gtk_cell_renderer_text_set_property (GObject *object,
case PROP_BACKGROUND_GDK: case PROP_BACKGROUND_GDK:
{ {
GdkColor *color; GdkColor *color;
GdkRGBA rgba;
color = g_value_get_boxed (value); color = g_value_get_boxed (value);
rgba.red = color->red / 65535.; if (color)
rgba.green = color->green / 65535.; {
rgba.blue = color->blue / 65535.; GdkRGBA rgba;
set_bg_color (celltext, &rgba); rgba.red = color->red / 65535.;
rgba.green = color->green / 65535.;
rgba.blue = color->blue / 65535.;
rgba.alpha = 1;
set_bg_color (celltext, &rgba);
}
else
{
set_bg_color (celltext, NULL);
}
} }
break; break;
case PROP_FOREGROUND_GDK: case PROP_FOREGROUND_GDK:
{ {
GdkColor *color; GdkColor *color;
GdkRGBA rgba;
color = g_value_get_boxed (value); color = g_value_get_boxed (value);
rgba.red = color->red / 65535.; if (color)
rgba.green = color->green / 65535.; {
rgba.blue = color->blue / 65535.; GdkRGBA rgba;
set_fg_color (celltext, &rgba); rgba.red = color->red / 65535.;
rgba.green = color->green / 65535.;
rgba.blue = color->blue / 65535.;
rgba.alpha = 1;
set_fg_color (celltext, &rgba);
}
else
{
set_fg_color (celltext, NULL);
}
} }
break; break;