From 072dde93878cf61c3d8020c29752310c66786bd9 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 15 Aug 2022 22:44:17 +0200 Subject: [PATCH] WindowServer: Always use the automatic cursor tracking window's cursor Whenever we're in the "automatic cursor tracking" state, we should only display the tracking window's cursor, as the state is globally modal. --- Userland/Services/WindowServer/WindowManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp index b4daf1d6bd..c0ef52d04b 100644 --- a/Userland/Services/WindowServer/WindowManager.cpp +++ b/Userland/Services/WindowServer/WindowManager.cpp @@ -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(*m_hovered_window).blocking_modal_window()) { if (modal_window->cursor()) return *modal_window->cursor();