AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix several bugs handling GtkTrayIcon symbolic colors

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=641059
This commit is contained in:
Dan Winship 2011-01-31 19:13:29 -05:00 committed by Matthias Clasen
parent 6d218084c3
commit fc43e42bf2
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkstatusicon.c
View File

@ -860,6 +860,12 @@ gtk_status_icon_init (GtkStatusIcon *status_icon)
gtk_container_add (GTK_CONTAINER (priv->tray_icon), priv->image); gtk_container_add (GTK_CONTAINER (priv->tray_icon), priv->image);
gtk_widget_show (priv->image); gtk_widget_show (priv->image);
/* Force-initialize the symbolic colors */
g_object_notify (G_OBJECT (priv->tray_icon), "fg-color");
g_object_notify (G_OBJECT (priv->tray_icon), "error-color");
g_object_notify (G_OBJECT (priv->tray_icon), "warning-color");
g_object_notify (G_OBJECT (priv->tray_icon), "success-color");
g_signal_connect_swapped (priv->image, "size-allocate", g_signal_connect_swapped (priv->image, "size-allocate",
G_CALLBACK (gtk_status_icon_size_allocate), status_icon); G_CALLBACK (gtk_status_icon_size_allocate), status_icon);
@ -1658,10 +1664,11 @@ static void
gtk_status_icon_fg_changed (GtkStatusIcon *status_icon) gtk_status_icon_fg_changed (GtkStatusIcon *status_icon)
{ {
GtkStatusIconPrivate *priv = status_icon->priv; GtkStatusIconPrivate *priv = status_icon->priv;
GdkColor color; GdkColor *color;
g_object_get (priv->tray_icon, "fg-color", &color, NULL); g_object_get (priv->tray_icon, "fg-color", &color, NULL);
gtk_widget_modify_fg (priv->image, GTK_STATE_NORMAL, &color); gtk_widget_modify_fg (priv->image, GTK_STATE_NORMAL, color);
gdk_color_free (color);
} }
static void static void
@ -1671,7 +1678,7 @@ gtk_status_icon_color_changed (GtkTrayIcon *tray,
{ {
GtkStatusIconPrivate *priv = status_icon->priv; GtkStatusIconPrivate *priv = status_icon->priv;
const gchar *name; const gchar *name;
GdkColor color; GdkColor *color;
switch (pspec->name[0]) switch (pspec->name[0])
{ {
@ -1695,10 +1702,11 @@ gtk_status_icon_color_changed (GtkTrayIcon *tray,
g_object_get (priv->tray_icon, pspec->name, &color, NULL); g_object_get (priv->tray_icon, pspec->name, &color, NULL);
rgba.red = color.red / 65535.; rgba.red = color->red / 65535.;
rgba.green = color.green / 65535.; rgba.green = color->green / 65535.;
rgba.blue = color.blue / 65535.; rgba.blue = color->blue / 65535.;
rgba.alpha = 1; rgba.alpha = 1;
gdk_color_free (color);
gtk_widget_override_symbolic_color (priv->image, name, &rgba); gtk_widget_override_symbolic_color (priv->image, name, &rgba);
} }

4
gtk/gtktrayicon-x11.c
View File

@ -555,8 +555,6 @@ gtk_tray_icon_get_colors_property (GtkTrayIcon *icon)
g_object_notify (G_OBJECT (icon), "error-color"); g_object_notify (G_OBJECT (icon), "error-color");
} }
g_object_thaw_notify (G_OBJECT (icon));
color.red = prop.prop[6]; color.red = prop.prop[6];
color.green = prop.prop[7]; color.green = prop.prop[7];
color.blue = prop.prop[8]; color.blue = prop.prop[8];
@ -568,8 +566,6 @@ gtk_tray_icon_get_colors_property (GtkTrayIcon *icon)
g_object_notify (G_OBJECT (icon), "warning-color"); g_object_notify (G_OBJECT (icon), "warning-color");
} }
g_object_thaw_notify (G_OBJECT (icon));
color.red = prop.prop[9]; color.red = prop.prop[9];
color.green = prop.prop[10]; color.green = prop.prop[10];
color.blue = prop.prop[11]; color.blue = prop.prop[11];