beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-24 00:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

WindowServer: Always use the automatic cursor tracking window's cursor

Browse source 
Whenever we're in the "automatic cursor tracking" state, we should only
display the tracking window's cursor, as the state is globally modal.
This commit is contained in:
Andreas Kling 2022-08-15 22:44:17 +02:00
parent 296e68fdbf
commit 072dde9387
Notes: sideshowbarker 2024-07-17 08:13:23 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/072dde9387
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1971,7 +1971,10 @@ Cursor const& WindowManager::active_cursor() const
} }
} }
if (m_hovered_window) { if (m_automatic_cursor_tracking_window) {
if (m_automatic_cursor_tracking_window->cursor())
return *m_automatic_cursor_tracking_window->cursor();
} else if (m_hovered_window) {
if (auto* modal_window = const_cast<Window&>(*m_hovered_window).blocking_modal_window()) { if (auto* modal_window = const_cast<Window&>(*m_hovered_window).blocking_modal_window()) {
if (modal_window->cursor()) if (modal_window->cursor())
return *modal_window->cursor(); return *modal_window->cursor();