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

WindowServer: Don't deactivate windows after moving them

Browse source 
Also make sure we send out the WM event for window deactivations.
This fixes an issue where the taskbar button for a window would appear
depressed, even after the window was deactivated.
This commit is contained in:
Andreas Kling 2019-12-31 03:44:39 +01:00
parent c9ec415e2f
commit f908ee3496
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Servers/WindowServer/WSWindowManager.cpp
View file

@ -963,7 +963,7 @@ void WSWindowManager::process_mouse_event(WSMouseEvent& event, WSWindow*& hovere
}); });
// Clicked outside of any window // Clicked outside of any window
if (!hovered_window && event.type() == WSEvent::MouseDown) if (!hovered_window && !event_window_with_frame && event.type() == WSEvent::MouseDown)
set_active_window(nullptr); set_active_window(nullptr);
} }
@ -1109,6 +1109,7 @@ void WSWindowManager::set_active_window(WSWindow* window)
CEventLoop::current().post_event(*previously_active_window, make<WSEvent>(WSEvent::WindowDeactivated)); CEventLoop::current().post_event(*previously_active_window, make<WSEvent>(WSEvent::WindowDeactivated));
invalidate(*previously_active_window); invalidate(*previously_active_window);
m_active_window = nullptr; m_active_window = nullptr;
tell_wm_listeners_window_state_changed(*previously_active_window);
} }
if (window) { if (window) {
@ -1120,8 +1121,6 @@ void WSWindowManager::set_active_window(WSWindow* window)
auto* client = window->client(); auto* client = window->client();
ASSERT(client); ASSERT(client);
set_current_menubar(client->app_menubar()); set_current_menubar(client->app_menubar());
if (previously_active_window)
tell_wm_listeners_window_state_changed(*previously_active_window);
tell_wm_listeners_window_state_changed(*m_active_window); tell_wm_listeners_window_state_changed(*m_active_window);
} }