invisible resizing areas/grips in the top corners of the window

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index 0bc820aefd358bc62b84e66b431533e1a0308736..c6c3a4a30e476d1eabe2e553fddd560b9594c44b 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -392,7 +392,8 @@ void menu_entry_fire(ObMenuEntry *self, unsigned int button, unsigned int x,
 {
     ObMenu *m;
 
-    if (button > 3) return;
+    /* ignore wheel scrolling */
+    if (button == 4 || button == 5) return;
 
     if (self->action) {
         self->action->data.any.c = self->parent->client;
@@ -581,8 +582,8 @@ void menu_control_keyboard_nav(unsigned int key)
         break;
     }
     default:
-        if (current_menu)
-            current_menu->hide(current_menu);
+        ((ObMenu *)menu_visible->data)->hide(menu_visible->data);
+        current_menu = NULL;
     }
     return;
 }