diff options
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Window.cc b/src/Window.cc index 56c6f95..2f06603 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -2154,11 +2154,11 @@ void FluxboxWindow::restoreAttributes() { | |||
2154 | Show the window menu at pos mx, my | 2154 | Show the window menu at pos mx, my |
2155 | */ | 2155 | */ |
2156 | void FluxboxWindow::showMenu(int menu_x, int menu_y) { | 2156 | void FluxboxWindow::showMenu(int menu_x, int menu_y) { |
2157 | // move menu directly under titlebar | 2157 | menu().reloadHelper()->checkReload(); |
2158 | 2158 | ||
2159 | int head = screen().getHead(menu_x, menu_y); | 2159 | int head = screen().getHead(menu_x, menu_y); |
2160 | 2160 | ||
2161 | // but not off the screen | 2161 | // move menu directly under titlebar but not off the screen |
2162 | if (menu_y < static_cast<signed>(screen().maxTop(head))) | 2162 | if (menu_y < static_cast<signed>(screen().maxTop(head))) |
2163 | menu_y = screen().maxTop(head); | 2163 | menu_y = screen().maxTop(head); |
2164 | else if (menu_y + menu().height() >= screen().maxBottom(head)) | 2164 | else if (menu_y + menu().height() >= screen().maxBottom(head)) |
@@ -3648,7 +3648,7 @@ const FbTk::FbWindow &FluxboxWindow::fbWindow() const { | |||
3648 | return frame().window(); | 3648 | return frame().window(); |
3649 | } | 3649 | } |
3650 | 3650 | ||
3651 | FbTk::Menu &FluxboxWindow::menu() { | 3651 | FbMenu &FluxboxWindow::menu() { |
3652 | return screen().windowMenu(); | 3652 | return screen().windowMenu(); |
3653 | } | 3653 | } |
3654 | 3654 | ||
@@ -3660,7 +3660,7 @@ const FbTk::PixmapWithMask &FluxboxWindow::icon() const { | |||
3660 | return (m_client ? m_client->icon() : m_icon); | 3660 | return (m_client ? m_client->icon() : m_icon); |
3661 | } | 3661 | } |
3662 | 3662 | ||
3663 | const FbTk::Menu &FluxboxWindow::menu() const { | 3663 | const FbMenu &FluxboxWindow::menu() const { |
3664 | return screen().windowMenu(); | 3664 | return screen().windowMenu(); |
3665 | } | 3665 | } |
3666 | 3666 | ||