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

WindowServer: Set no active windows on a click outside of any window

Browse source
This commit is contained in:
Shannon Booth 2019-12-31 13:38:56 +13:00 • committed by Andreas Kling
parent d0f9906c17
commit 8dc6fc9aca
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Servers/WindowServer/WSWindowManager.cpp
View file

@ -961,6 +961,11 @@ void WSWindowManager::process_mouse_event(WSMouseEvent& event, WSWindow*& hovere
event_window_with_frame = &window;
return IterationDecision::Break;
});
// Clicked outside of any window
if (!hovered_window && event.type() == WSEvent::MouseDown)
set_active_window(nullptr);
}
if (event_window_with_frame != m_resize_candidate.ptr())
@ -1088,7 +1093,7 @@ void WSWindowManager::set_active_window(WSWindow* window)
if (window && window->is_blocked_by_modal_window())
return;
if (window->type() != WSWindowType::Normal)
if (window && window->type() != WSWindowType::Normal)
return;
if (window == m_active_window)
@ -1103,9 +1108,11 @@ void WSWindowManager::set_active_window(WSWindow* window)
previously_active_client = previously_active_window->client();
CEventLoop::current().post_event(*previously_active_window, make<WSEvent>(WSEvent::WindowDeactivated));
invalidate(*previously_active_window);
m_active_window = nullptr;
}
m_active_window = window->make_weak_ptr();
if (m_active_window) {
if (window) {
m_active_window = window->make_weak_ptr();
active_client = m_active_window->client();
CEventLoop::current().post_event(*m_active_window, make<WSEvent>(WSEvent::WindowActivated));
invalidate(*m_active_window);