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

LibGUI: Retain the active input tracking widget's cursor

Browse source 
Until the tracking stops, we want to keep displaying the same cursor.
This commit is contained in:
Andreas Kling 2022-08-15 22:29:12 +02:00
parent 1885445a79
commit 6548ae8afd
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibGUI/Widget.h
View file

@ -345,7 +345,7 @@ public:
virtual Gfx::IntRect children_clip_rect() const; virtual Gfx::IntRect children_clip_rect() const;
AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> override_cursor() const { return m_override_cursor; } AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> const& override_cursor() const { return m_override_cursor; }
void set_override_cursor(AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>>); void set_override_cursor(AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>>);
bool load_from_gml(StringView); bool load_from_gml(StringView);

15
Userland/Libraries/LibGUI/Window.cpp
View file

@ -1177,10 +1177,17 @@ void Window::update_cursor()
{ {
auto new_cursor = m_cursor; auto new_cursor = m_cursor;
if (m_hovered_widget) { auto is_usable_cursor = [](auto& cursor) {
auto override_cursor = m_hovered_widget->override_cursor(); return cursor.template has<NonnullRefPtr<Gfx::Bitmap>>() || cursor.template get<Gfx::StandardCursor>() != Gfx::StandardCursor::None;
if (override_cursor.has<NonnullRefPtr<Gfx::Bitmap>>() || override_cursor.get<Gfx::StandardCursor>() != Gfx::StandardCursor::None) };
new_cursor = move(override_cursor);
// NOTE: If there's an automatic cursor tracking widget, we retain its cursor until tracking stops.
if (auto widget = m_automatic_cursor_tracking_widget) {
if (is_usable_cursor(widget->override_cursor()))
new_cursor = widget->override_cursor();
} else if (auto widget = m_hovered_widget) {
if (is_usable_cursor(widget->override_cursor()))
new_cursor = widget->override_cursor();
} }
if (are_cursors_the_same(m_effective_cursor, new_cursor)) if (are_cursors_the_same(m_effective_cursor, new_cursor))