RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

WindowServer: Set no active window if no new candidates are available

Browse source
This commit is contained in:
Jami Kettunen 2020-01-04 13:04:36 +02:00 • committed by Andreas Kling
parent c663b1034a
commit a641f4d213
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Servers/WindowServer/WSWindowManager.cpp
View file

@ -348,8 +348,6 @@ void WSWindowManager::remove_window(WSWindow& window)
m_windows_in_order.remove(&window); m_windows_in_order.remove(&window);
if (window.is_active()) if (window.is_active())
pick_new_active_window(); pick_new_active_window();
if (m_active_window.ptr() == &window)
set_active_window(nullptr);
if (m_switcher.is_visible() && window.type() != WSWindowType::WindowSwitcher) if (m_switcher.is_visible() && window.type() != WSWindowType::WindowSwitcher)
m_switcher.refresh(); m_switcher.refresh();
@ -489,10 +487,14 @@ void WSWindowManager::notify_occlusion_state_changed(WSWindow& window)
void WSWindowManager::pick_new_active_window() void WSWindowManager::pick_new_active_window()
{ {
bool new_window_picked = false;
for_each_visible_window_of_type_from_front_to_back(WSWindowType::Normal, [&](WSWindow& candidate) { for_each_visible_window_of_type_from_front_to_back(WSWindowType::Normal, [&](WSWindow& candidate) {
set_active_window(&candidate); set_active_window(&candidate);
new_window_picked = true;
return IterationDecision::Break; return IterationDecision::Break;
}); });
if (!new_window_picked)
set_active_window(nullptr);
} }
void WSWindowManager::start_window_move(WSWindow& window, const WSMouseEvent& event) void WSWindowManager::start_window_move(WSWindow& window, const WSMouseEvent& event)