mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-09-30 13:19:02 +00:00
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.
This commit is contained in:
parent
f908ee3496
commit
5b1f8ce220
Notes:
sideshowbarker
2024-07-19 10:30:47 +09:00
Author: https://github.com/jcs
Commit: 5b1f8ce220
Pull-request: https://github.com/SerenityOS/serenity/pull/969
1 changed files with 4 additions and 0 deletions
|
@ -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) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue