Fleshing out the image property handler.

1 files changed, 88 insertions, 4 deletions

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index 0936fc8..b615019 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -33,6 +33,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include <gtk/gtk.h>
 
 #include "client.h"
+#include "menuitem.h"
 
 /* Prototypes */
 static void dbusmenu_gtkclient_class_init (DbusmenuGtkClientClass *klass);
@@ -322,14 +323,97 @@ new_item_seperator (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm
 	return TRUE;
 }
 
+/* This handler looks at property changes for items that are
+   image menu items. */
 static void
-image_property_handle (DbusmenuMenuitem * item, const gchar * property, const gchar * value, gpointer user_data)
+image_property_handle (DbusmenuMenuitem * item, const gchar * property, const gchar * value, gpointer userdata)
 {
+	if (g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON) ||
+	        g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON_DATA)) {
+		/* We're only looking at these two properties here */
+		return;
+	}
+
+	if (value == NULL || value[0] == '\0') {
+		/* This means that we're unsetting a value. */
+		/* Try to use the other one */
+		if (g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON)) {
+			property = DBUSMENU_MENUITEM_PROP_ICON_DATA;
+		} else {
+			property = DBUSMENU_MENUITEM_PROP_ICON;
+		}
+	}
+
+	/* Grab the data of the items that we've got, so that
+	   we can know how things need to change. */
+	GtkMenuItem * gimi = dbusmenu_gtkclient_menuitem_get (DBUSMENU_GTKCLIENT(userdata), item);
+	if (gimi == NULL) {
+		g_warning("Oddly we're handling image properties on a menuitem that doesn't have any GTK structures associated with it.");
+		return;
+	}
+	GtkWidget * gtkimage = gtk_image_menu_item_get_image(GTK_IMAGE_MENU_ITEM(gimi));
+
+	/* Now figure out what to change */
+	if (g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON)) {
+		const gchar * iconname = dbusmenu_menuitem_property_get(item, property);
+		if (iconname == NULL) {
+			/* If there is no name, by golly we want no
+			   icon either. */
+			gtkimage = NULL;
+		} else {
+			/* If we don't have an image, we need to build
+			   one so that we can set the name.  Otherwise we
+			   can just convert it to this name. */
+			if (gtkimage == NULL) {
+				gtkimage = gtk_image_new_from_icon_name(iconname, GTK_ICON_SIZE_MENU);
+			} else {
+				gtk_image_set_from_icon_name(GTK_IMAGE(gtkimage), iconname, GTK_ICON_SIZE_MENU);
+			}
+		}
+	} else {
+		GdkPixbuf * image = dbusmenu_menuitem_property_get_image(item, property);
+		if (image == NULL) {
+			/* If there is no pixbuf, by golly we want no
+			   icon either. */
+			gtkimage = NULL;
+		} else {
+			/* Resize the pixbuf */
+			gint width, height;
+			gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
+			if (gdk_pixbuf_get_width(image) > width ||
+					gdk_pixbuf_get_height(image) > height) {
+				GdkPixbuf * newimage = gdk_pixbuf_scale_simple(image,
+				                                               width,
+				                                               height,
+				                                               GDK_INTERP_BILINEAR);
+				g_object_unref(image);
+				image = newimage;
+			}
+			
+			/* If we don't have an image, we need to build
+			   one so that we can set the pixbuf. */
+			if (gtkimage == NULL) {
+				gtkimage = gtk_image_new_from_pixbuf(image);
+			} else {
+				/* If we have an image already built from a name that is
+				   way better than a pixbuf.  Keep it. */
+				if (gtk_image_get_storage_type(GTK_IMAGE(gtkimage)) != GTK_IMAGE_ICON_NAME) {
+					gtk_image_set_from_pixbuf(GTK_IMAGE(gtkimage), image);
+				} else {
+					g_debug("Blocking icon image data as already set by name.");
+				}
+			}
+		}
+
+	}
 
+	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(gimi), gtkimage);
 
 	return;
 }
 
+/* This is a type call back for the image type where
+   it uses the GtkImageMenuitem to create the menu item. */
 static gboolean
 new_item_image (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
 {
@@ -349,15 +433,15 @@ new_item_image (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuC
 	image_property_handle(newitem,
 	                      DBUSMENU_MENUITEM_PROP_ICON,
 	                      dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_ICON),
-	                      NULL);
+	                      client);
 	image_property_handle(newitem,
 	                      DBUSMENU_MENUITEM_PROP_ICON_DATA,
 	                      dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_ICON_DATA),
-	                      NULL);
+	                      client);
 	g_signal_connect(G_OBJECT(newitem),
 	                 DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED,
 	                 G_CALLBACK(image_property_handle),
-	                 NULL);
+	                 client);
 
 	return TRUE;
 }