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

WindowServer: Include window frames when sending drag events

Browse source 
Previously, the cursor would use a default cursor on window frames such
as the title bar and menu bar, which was not quite correct as drop
events were still handled there.
This commit is contained in:
Karol Kosek 2022-08-21 00:45:05 +02:00 • committed by Sam Atkins
parent 2e244fc85b
commit d4aff36875
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Services/WindowServer/WindowManager.cpp
View file

@ -1016,7 +1016,7 @@ bool WindowManager::process_ongoing_drag(MouseEvent& event)
m_dnd_overlay->cursor_moved(); m_dnd_overlay->cursor_moved();
// We didn't let go of the drag yet, see if we should send some drag move events.. // We didn't let go of the drag yet, see if we should send some drag move events..
if (auto* window = current_window_stack().window_at(event.position(), WindowStack::IncludeWindowFrame::No)) { if (auto* window = hovered_window()) {
event.set_drag(true); event.set_drag(true);
event.set_mime_data(*m_dnd_mime_data); event.set_mime_data(*m_dnd_mime_data);
deliver_mouse_event(*window, event, false); deliver_mouse_event(*window, event, false);
@ -1028,7 +1028,7 @@ bool WindowManager::process_ongoing_drag(MouseEvent& event)
if (!(event.type() == Event::MouseUp && event.button() == MouseButton::Primary)) if (!(event.type() == Event::MouseUp && event.button() == MouseButton::Primary))
return true; return true;
if (auto* window = current_window_stack().window_at(event.position())) { if (auto* window = hovered_window()) {
m_dnd_client->async_drag_accepted(); m_dnd_client->async_drag_accepted();
if (window->client()) { if (window->client()) {
auto translated_event = event.translated(-window->position()); auto translated_event = event.translated(-window->position());
@ -1429,8 +1429,9 @@ void WindowManager::event(Core::Event& event)
process_mouse_event(mouse_event); process_mouse_event(mouse_event);
m_last_processed_buttons = mouse_event.buttons(); m_last_processed_buttons = mouse_event.buttons();
auto include_window_frame = m_dnd_client ? WindowStack::IncludeWindowFrame::Yes : WindowStack::IncludeWindowFrame::No;
// TODO: handle transitioning between two stacks // TODO: handle transitioning between two stacks
set_hovered_window(current_window_stack().window_at(mouse_event.position(), WindowStack::IncludeWindowFrame::No)); set_hovered_window(current_window_stack().window_at(mouse_event.position(), include_window_frame));
return; return;
} }