WindowServer: Show modal window's cursor over blocked windows

When a window is blocked by a modal window from the same application, we now prefer the modal window's cursor instead of the hovered window.
fleximus · Nov 10, 2020 · ebaf205 · ebaf205
1 parent 75f61fe
commit ebaf205
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Services/WindowServer/WindowManager.cpp b/Services/WindowServer/WindowManager.cpp
@@ -1306,8 +1306,14 @@ const Cursor& WindowManager::active_cursor() const
  }
  }
 
- if (m_hovered_window && m_hovered_window->cursor())
- return *m_hovered_window->cursor();
+ if (m_hovered_window) {
+ if (auto* modal_window = const_cast<Window&>(*m_hovered_window).is_blocked_by_modal_window()) {
+ if (modal_window->cursor())
+ return *modal_window->cursor();
+ } else if (m_hovered_window->cursor()) {
+ return *m_hovered_window->cursor();
+ }
+ }
 
  return *m_arrow_cursor;
 }