From a81581129a84580c2ce0d135db8b091a959da178 Mon Sep 17 00:00:00 2001
From: Travis McLane <tmclane@gmail.com>
Date: Fri, 27 Oct 2023 16:44:22 -0500
Subject: [PATCH] [v3 linux] menu bitmap update handling

---
 v3/pkg/application/linux_cgo.go | 47 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/v3/pkg/application/linux_cgo.go b/v3/pkg/application/linux_cgo.go
index c5d3698af..32f57d3e3 100644
--- a/v3/pkg/application/linux_cgo.go
+++ b/v3/pkg/application/linux_cgo.go
@@ -458,30 +458,26 @@ func menuItemSetLabel(widget pointer, label string) {
 	C.free(unsafe.Pointer(value))
 }
 
-/*
-     GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  GtkWidget *icon = gtk_image_new_from_icon_name ("folder-music-symbolic", GTK_ICON_SIZE_MENU);
-  GtkWidget *label = gtk_label_new ("Music");
-  GtkWidget *menu_item = gtk_menu_item_new ();
+func menuItemRemoveBitmap(widget pointer) {
+	box := C.gtk_bin_get_child((*C.GtkBin)(widget))
+	if box == nil {
+		return
+	}
 
-  gtk_container_add (GTK_CONTAINER (box), icon);
-  gtk_container_add (GTK_CONTAINER (box), label);
+	children := C.gtk_container_get_children((*C.GtkContainer)(unsafe.Pointer(box)))
+	defer C.g_list_free(children)
+	count := int(C.g_list_length(children))
+	if count == 2 {
+		C.gtk_container_remove((*C.GtkContainer)(unsafe.Pointer(box)),
+			(*C.GtkWidget)(children.data))
+	}
+}
 
-  gtk_container_add (GTK_CONTAINER (menu_item), box);
-
-  gtk_widget_show_all (menu_item);
-*/
-
-func menuItemSetBitmap(widget pointer, data []byte) {
-	children := C.gtk_container_get_children((*C.GtkContainer)(widget))
-	fmt.Println("children", children)
-
-	parent := C.gtk_widget_get_parent((*C.GtkWidget)(widget))
-	fmt.Println("parent", parent)
-	//parent := C.gtk_widget_get_parent((*C.GtkWidget)widget)
-	if img, err := pngToImage(data); err == nil {
-		gbytes := C.g_bytes_new_static(
-			C.gconstpointer(unsafe.Pointer(&img.Pix[0])),
+func menuItemSetBitmap(widget pointer, bitmap []byte) {
+	menuItemRemoveBitmap(widget)
+	box := C.gtk_bin_get_child((*C.GtkBin)(widget))
+	if img, err := pngToImage(bitmap); err == nil {
+		gbytes := C.g_bytes_new_static(C.gconstpointer(unsafe.Pointer(&img.Pix[0])),
 			C.ulong(len(img.Pix)))
 		defer C.g_bytes_unref(gbytes)
 		pixBuf := C.gdk_pixbuf_new_from_bytes(
@@ -494,9 +490,12 @@ func menuItemSetBitmap(widget pointer, data []byte) {
 			C.int(img.Stride),
 		)
 		image := C.gtk_image_new_from_pixbuf(pixBuf)
-		fmt.Println("image", image)
-		//		C.gtk_menu_item_set_image((*C.GtkMenuItem)(widget), image)
+		C.gtk_widget_set_visible((*C.GtkWidget)(image), C.gboolean(1))
+		C.gtk_container_add(
+			(*C.GtkContainer)(unsafe.Pointer(box)),
+			(*C.GtkWidget)(unsafe.Pointer(image)))
 	}
+
 }
 
 func menuItemSetToolTip(widget pointer, tooltip string) {