fix window menu placement with toolbar at top of screen, and disable titlebar when doing it

2 files changed, 4 insertions, 3 deletions

diff --git a/src/IconButton.cc b/src/IconButton.cc
index b9cf523..aaff5b8 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -57,7 +57,6 @@ public:
     explicit ShowMenu(FluxboxWindow &win):m_win(win) { }
     void execute() {
         m_win.screen().hideMenus();
-        m_win.menu().enableTitle();
         // get last button pos
         const XEvent &event = Fluxbox::instance()->lastEvent();
         int x = event.xbutton.x_root - (m_win.menu().width() / 2);
diff --git a/src/Window.cc b/src/Window.cc
index 523fd66..d878e2e 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2333,8 +2333,10 @@ void FluxboxWindow::showMenu(int menu_x, int menu_y) {
 
     int head = screen().getHead(menu_x, menu_y);
 
-    // but not under screen
-    if (menu_y + menu().height() >= screen().maxBottom(head))
+    // but not off the screen
+    if (menu_y < static_cast<signed>(screen().maxTop(head)))
+        menu_y = screen().maxTop(head);
+    else if (menu_y + menu().height() >= screen().maxBottom(head))
         menu_y = screen().maxBottom(head) - menu().height() - 1 - menu().fbwindow().borderWidth();
 
     if (menu_x < static_cast<signed>(screen().maxLeft(head)))