From 5b1f8ce220bdceb06076d415689832fa9e5022db Mon Sep 17 00:00:00 2001 From: joshua stein Date: Mon, 30 Dec 2019 21:06:21 -0600 Subject: [PATCH] WindowServer: set no menu bar when last window is removed This is done here rather than pick_new_active_window() so that when there are no other windows to focus but the previous window hasn't been removed (just minimized), the menu bar remains on that client. --- Servers/WindowServer/WSWindowManager.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Servers/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp index b76234213d5a8f..d40d38ea208cc5 100644 --- a/Servers/WindowServer/WSWindowManager.cpp +++ b/Servers/WindowServer/WSWindowManager.cpp @@ -348,6 +348,8 @@ void WSWindowManager::remove_window(WSWindow& window) m_windows_in_order.remove(&window); if (window.is_active()) pick_new_active_window(); + if (m_active_window.ptr() == &window) + set_active_window(nullptr); if (m_switcher.is_visible() && window.type() != WSWindowType::WindowSwitcher) m_switcher.refresh(); @@ -1122,6 +1124,8 @@ void WSWindowManager::set_active_window(WSWindow* window) ASSERT(client); set_current_menubar(client->app_menubar()); tell_wm_listeners_window_state_changed(*m_active_window); + } else { + set_current_menubar(nullptr); } if (active_client != previously_active_client) {