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

WindowServer: Process dnd mouse events first

Browse source 
Fixes duplicate GUI::DragOperation instances being created.

Fixes #3151
This commit is contained in:
Tom 2020-08-19 07:14:49 -06:00 • committed by Andreas Kling
parent 8e97de2df9
commit f503d3c046
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Services/WindowServer/WindowManager.cpp
View file

@ -874,6 +874,11 @@ void WindowManager::process_mouse_event(MouseEvent& event, Window*& hovered_wind
{ {
HashTable<Window*> windows_who_received_mouse_event_due_to_cursor_tracking; HashTable<Window*> windows_who_received_mouse_event_due_to_cursor_tracking;
// We need to process ongoing drag events first. Otherwise, global tracking
// and dnd collides, leading to duplicate GUI::DragOperation instances
if (process_ongoing_drag(event, hovered_window))
return;
for (auto* window = m_windows_in_order.tail(); window; window = window->prev()) { for (auto* window = m_windows_in_order.tail(); window; window = window->prev()) {
if (!window->global_cursor_tracking() || !window->is_visible() || window->is_minimized() || window->is_blocked_by_modal_window()) if (!window->global_cursor_tracking() || !window->is_visible() || window->is_minimized() || window->is_blocked_by_modal_window())
continue; continue;
@ -884,9 +889,6 @@ void WindowManager::process_mouse_event(MouseEvent& event, Window*& hovered_wind
hovered_window = nullptr; hovered_window = nullptr;
if (process_ongoing_drag(event, hovered_window))
return;
if (process_ongoing_window_move(event, hovered_window)) if (process_ongoing_window_move(event, hovered_window))
return; return;