1 files changed, 19 insertions, 0 deletions

diff --git a/src/FbMenu.cc b/src/FbMenu.cc
index 54b6c4a..12ee2f1 100644
--- a/src/FbMenu.cc
+++ b/src/FbMenu.cc
@@ -23,6 +23,9 @@
 
 #include "fluxbox.hh"
 #include "Screen.hh"
+#include "WindowCmd.hh"
+
+FluxboxWindow *FbMenu::s_window = 0;
 
 FbMenu::FbMenu(FbTk::ThemeProxy<FbTk::MenuTheme> &tm,
                FbTk::ImageControl &imgctrl, FbTk::XLayer &layer):
@@ -31,6 +34,16 @@ FbMenu::FbMenu(FbTk::ThemeProxy<FbTk::MenuTheme> &tm,
 
 }
 
+void FbMenu::show() {
+    WindowCmd<void>::setWindow(s_window);
+    FbTk::Menu::show();
+}
+
+void FbMenu::buttonPressEvent(XButtonEvent &be) {
+    WindowCmd<void>::setWindow(s_window);
+    FbTk::Menu::buttonPressEvent(be);
+}
+
 void FbMenu::buttonReleaseEvent(XButtonEvent &be) {
     BScreen *screen = Fluxbox::instance()->findScreen(screenNumber());
     if (be.window == titleWindow() && isMoving() && screen) {
@@ -41,7 +54,13 @@ void FbMenu::buttonReleaseEvent(XButtonEvent &be) {
                   screen->getHeadWidth(head),
                   screen->getHeadHeight(head));
     }
+    WindowCmd<void>::setWindow(s_window);
 
     // now get on with the show
     FbTk::Menu::buttonReleaseEvent(be);
 }
+
+void FbMenu::keyPressEvent(XKeyEvent &ke) {
+    WindowCmd<void>::setWindow(s_window);
+    FbTk::Menu::keyPressEvent(ke);
+}