Merge lp:~lanoxx/indicator-applet/menuitemfix into lp:indicator-applet

[Sebastian Geiger]

This will make sure that indicator menus have the correct size.

Unmerged revisions

430. By Sebastian Geiger <sebastiangeiger@mars> on 2014-05-13

Workaround: Fix menus having wrong size

 * This patch is needed when menus are
   in a panel that appears at the bottom
   of the screen. It recomputes the size
   of the menu each time a menu item
   is added to the menu.
 * If menu items are added or removed
   from the panel then it happens
   that the panel gets a wrong
   size allocated. This is caused by
   a bug in GTK+ see [1].
 * This patch is a workaround for the bug
   as its unlikely the bug will get fixed
   in Gtk in the near future.

[1] https://bugzilla.gnome.org/show_bug.cgi?id=726030

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2016-11-22 11:00:11 +0000
+++ src/applet-main.c	2017-02-26 11:18:09 +0000
@@ -364,6 +364,22 @@
   return;
 }
 
+static void
+size_allocate (GtkWidget *widget, GtkAllocation *allocation) {
+    int height = 0;
+    if(GTK_IS_CONTAINER(widget)) {
+        GList *children = gtk_container_get_children(GTK_CONTAINER(widget));
+        GList *l;
+        for (l = children; l != NULL; l = l->next) {
+            GtkAllocation ca;
+            gtk_widget_get_allocation (l->data, &ca);
+            height += ca.height;
+        }
+    }
+    allocation->height = height;
+    gtk_widget_set_allocation(widget, allocation);
+}
+
 static GtkWidget*
 create_menuitem (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
 {
@@ -387,6 +403,7 @@
   g_signal_connect(G_OBJECT(menuitem), "enter-notify-event", G_CALLBACK(entry_secondary_activated), NULL);
   g_signal_connect(G_OBJECT(menuitem), "leave-notify-event", G_CALLBACK(entry_secondary_activated), NULL);
   g_signal_connect(G_OBJECT(menuitem), "scroll-event", G_CALLBACK(entry_scrolled), NULL);
+  g_signal_connect(G_OBJECT(entry->menu), "size-allocate", G_CALLBACK(size_allocate), NULL); 
 
   if (entry->image != NULL) {
     gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 1);