X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=4c7adc926ff2ce2faa30ea1c1a1e4fcc809007f4;hb=d03c1afac676c612c2d70584ceb4101607ac4c7e;hp=c953708bbd9ea5659fe4aabccddc5496523a14db;hpb=0e69ae2b96fb4dd7435ebe15645d1384d11a3ef7;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index c953708b..4c7adc92 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -40,11 +40,10 @@ void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
         g_message("menu label %s", title);
 
         if (parse_attr_string("plugin", node, &plugin)) {
-            PluginMenuCreateData data = {
-                .doc = doc,
-                .node = node,
-                .parent = menu
-            };
+            PluginMenuCreateData data;
+            data.doc = doc;
+            data.node = node;
+            data.parent = menu;
             parent = plugin_create(plugin, &data);
             g_free(plugin);
         } else
@@ -367,9 +366,19 @@ void menu_hide(ObMenu *self) {
         self->shown = FALSE;
 	if (self->open_submenu)
 	    menu_hide(self->open_submenu);
-	if (self->parent && self->parent->open_submenu == self)
+	if (self->parent && self->parent->open_submenu == self) {
+            ObMenuEntry *e;
+
 	    self->parent->open_submenu = NULL;
 
+            e = menu_find_entry_by_submenu(self->parent, self);
+            if (self->parent->mouseover)
+                self->parent->mouseover(e, FALSE);
+            else
+                menu_control_mouseover(e, FALSE);
+            menu_entry_render(e);
+        }
+
         if (!(self->parent && self->parent->shown)) {
             grab_keyboard(FALSE);
             grab_pointer(FALSE, None);