From 5872cb398c1db5dc1750151bb0a7e02e0b195074 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 11 Sep 2020 14:28:05 +0200 Subject: [PATCH] LibWeb: Use widget override cursors --- Libraries/LibWeb/InProcessWebView.cpp | 6 ++---- Libraries/LibWeb/OutOfProcessWebView.cpp | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Libraries/LibWeb/InProcessWebView.cpp b/Libraries/LibWeb/InProcessWebView.cpp index 8617bff3e3..34896db864 100644 --- a/Libraries/LibWeb/InProcessWebView.cpp +++ b/Libraries/LibWeb/InProcessWebView.cpp @@ -357,9 +357,7 @@ void InProcessWebView::load_html(const StringView& html, const URL& url) bool InProcessWebView::load(const URL& url) { - if (window()) - window()->set_cursor(Gfx::StandardCursor::None); - + set_override_cursor(Gfx::StandardCursor::None); return page().main_frame().loader().load(url, FrameLoader::Type::Navigation); } @@ -378,7 +376,7 @@ LayoutDocument* InProcessWebView::layout_root() void InProcessWebView::page_did_request_scroll_into_view(const Gfx::IntRect& rect) { scroll_into_view(rect, true, true); - window()->set_cursor(Gfx::StandardCursor::None); + set_override_cursor(Gfx::StandardCursor::None); } void InProcessWebView::load_empty_document() diff --git a/Libraries/LibWeb/OutOfProcessWebView.cpp b/Libraries/LibWeb/OutOfProcessWebView.cpp index 3710ab701c..3fe4b19052 100644 --- a/Libraries/LibWeb/OutOfProcessWebView.cpp +++ b/Libraries/LibWeb/OutOfProcessWebView.cpp @@ -137,16 +137,14 @@ void OutOfProcessWebView::notify_server_did_request_scroll_into_view(Badge, const URL& url) { - if (window()) - window()->set_cursor(Gfx::StandardCursor::Hand); + set_override_cursor(Gfx::StandardCursor::Hand); if (on_link_hover) on_link_hover(url); } void OutOfProcessWebView::notify_server_did_unhover_link(Badge) { - if (window()) - window()->set_cursor(Gfx::StandardCursor::None); + set_override_cursor(Gfx::StandardCursor::None); if (on_link_hover) on_link_hover({}); }