only allow one open menu at a time

1 files changed, 15 insertions, 21 deletions

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index f67311c..55ae1d3 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -534,27 +534,21 @@ void Toolbar::buttonPressEvent(XButtonEvent &be) {
     if (be.button != 3)
         return;
 
-    screen().hideMenus();
-
-    if (! menu().isVisible()) {
-
-        int head = screen().getHead(be.x_root, be.y_root);
-        int borderw = menu().fbwindow().borderWidth();
-        pair<int, int> m = screen().clampToHead(head,
-                                                be.x_root - (menu().width() / 2),
-                                                be.y_root - (menu().titleWindow().height() / 2),
-                                                menu().width() + 2*borderw,
-                                                menu().height() + 2*borderw);
-
-        menu().setScreen(screen().getHeadX(head),
-                         screen().getHeadY(head),
-                         screen().getHeadWidth(head),
-                         screen().getHeadHeight(head));
-        menu().move(m.first, m.second);
-        menu().show();
-        menu().grabInputFocus();
-    } else
-        menu().hide();
+    int head = screen().getHead(be.x_root, be.y_root);
+    int borderw = menu().fbwindow().borderWidth();
+    pair<int, int> m = screen().clampToHead(head,
+                                            be.x_root - (menu().width() / 2),
+                                            be.y_root - (menu().titleWindow().height() / 2),
+                                            menu().width() + 2*borderw,
+                                            menu().height() + 2*borderw);
+
+    menu().setScreen(screen().getHeadX(head),
+                     screen().getHeadY(head),
+                     screen().getHeadWidth(head),
+                     screen().getHeadHeight(head));
+    menu().move(m.first, m.second);
+    menu().show();
+    menu().grabInputFocus();
 
 }