RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 20:37:34 +00:00
Code Issues Activity Actions

LibGUI: Rename ScrollableWidget => AbstractScrollableWidget

Browse source
This commit is contained in:
Andreas Kling 2021-05-03 20:31:58 +02:00
parent 62125796c3
commit d47f15ab8b
26 changed files with 95 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibWeb/InProcessWebView.cpp
View file

@ -225,7 +225,7 @@ void InProcessWebView::layout_and_sync_size()
void InProcessWebView::resize_event(GUI::ResizeEvent& event)
{
GUI::ScrollableWidget::resize_event(event);
GUI::AbstractScrollableWidget::resize_event(event);
layout_and_sync_size();
}
@ -254,25 +254,25 @@ void InProcessWebView::paint_event(GUI::PaintEvent& event)
void InProcessWebView::mousemove_event(GUI::MouseEvent& event)
{
page().handle_mousemove(to_content_position(event.position()), event.buttons(), event.modifiers());
GUI::ScrollableWidget::mousemove_event(event);
GUI::AbstractScrollableWidget::mousemove_event(event);
}
void InProcessWebView::mousedown_event(GUI::MouseEvent& event)
{
page().handle_mousedown(to_content_position(event.position()), event.button(), event.modifiers());
GUI::ScrollableWidget::mousedown_event(event);
GUI::AbstractScrollableWidget::mousedown_event(event);
}
void InProcessWebView::mouseup_event(GUI::MouseEvent& event)
{
page().handle_mouseup(to_content_position(event.position()), event.button(), event.modifiers());
GUI::ScrollableWidget::mouseup_event(event);
GUI::AbstractScrollableWidget::mouseup_event(event);
}
void InProcessWebView::mousewheel_event(GUI::MouseEvent& event)
{
page().handle_mousewheel(to_content_position(event.position()), event.button(), event.modifiers(), event.wheel_delta());
GUI::ScrollableWidget::mousewheel_event(event);
GUI::AbstractScrollableWidget::mousewheel_event(event);
}
void InProcessWebView::keydown_event(GUI::KeyEvent& event)
@ -307,7 +307,7 @@ void InProcessWebView::keydown_event(GUI::KeyEvent& event)
break;
default:
if (!page_accepted_event) {
ScrollableWidget::keydown_event(event);
AbstractScrollableWidget::keydown_event(event);
return;
}
break;
@ -391,7 +391,7 @@ void InProcessWebView::drop_event(GUI::DropEvent& event)
return;
}
}
ScrollableWidget::drop_event(event);
AbstractScrollableWidget::drop_event(event);
}
void InProcessWebView::page_did_request_alert(const String& message)

6
Userland/Libraries/LibWeb/InProcessWebView.h
View file

@ -7,8 +7,8 @@
#pragma once
#include <AK/URL.h>
#include <LibGUI/AbstractScrollableWidget.h>
#include <LibGUI/Desktop.h>
#include <LibGUI/ScrollableWidget.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Page/Page.h>
#include <LibWeb/WebViewHooks.h>
@ -16,7 +16,7 @@
namespace Web {
class InProcessWebView final
: public GUI::ScrollableWidget
: public GUI::AbstractScrollableWidget
, public WebViewHooks
, public PageClient {
C_OBJECT(InProcessWebView);
@ -67,7 +67,7 @@ private:
// ^Web::PageClient
virtual bool is_multi_process() const override { return false; }
virtual Gfx::Palette palette() const override { return GUI::ScrollableWidget::palette(); }
virtual Gfx::Palette palette() const override { return GUI::AbstractScrollableWidget::palette(); }
virtual Gfx::IntRect screen_rect() const override { return GUI::Desktop::the().rect(); }
virtual void page_did_change_title(const String&) override;
virtual void page_did_set_document_in_main_frame(DOM::Document*) override;

6
Userland/Libraries/LibWeb/OutOfProcessWebView.cpp
View file

@ -92,7 +92,7 @@ void OutOfProcessWebView::load_empty_document()
void OutOfProcessWebView::paint_event(GUI::PaintEvent& event)
{
GUI::ScrollableWidget::paint_event(event);
GUI::AbstractScrollableWidget::paint_event(event);
// If the available size is empty, we don't have a front or back bitmap to draw.
if (available_size().is_empty())
@ -113,7 +113,7 @@ void OutOfProcessWebView::paint_event(GUI::PaintEvent& event)
void OutOfProcessWebView::resize_event(GUI::ResizeEvent& event)
{
GUI::ScrollableWidget::resize_event(event);
GUI::AbstractScrollableWidget::resize_event(event);
handle_resize();
}
@ -185,7 +185,7 @@ void OutOfProcessWebView::mousewheel_event(GUI::MouseEvent& event)
void OutOfProcessWebView::theme_change_event(GUI::ThemeChangeEvent& event)
{
GUI::ScrollableWidget::theme_change_event(event);
GUI::AbstractScrollableWidget::theme_change_event(event);
client().post_message(Messages::WebContentServer::UpdateSystemTheme(Gfx::current_system_theme_buffer()));
request_repaint();
}

6
Userland/Libraries/LibWeb/OutOfProcessWebView.h
View file

@ -7,7 +7,7 @@
#pragma once
#include <AK/URL.h>
#include <LibGUI/ScrollableWidget.h>
#include <LibGUI/AbstractScrollableWidget.h>
#include <LibGUI/Widget.h>
#include <LibWeb/WebViewHooks.h>
@ -16,7 +16,7 @@ namespace Web {
class WebContentClient;
class OutOfProcessWebView final
: public GUI::ScrollableWidget
: public GUI::AbstractScrollableWidget
, public Web::WebViewHooks {
C_OBJECT(OutOfProcessWebView);
@ -76,7 +76,7 @@ private:
virtual void theme_change_event(GUI::ThemeChangeEvent&) override;
virtual void screen_rect_change_event(GUI::ScreenRectChangeEvent&) override;
// ^ScrollableWidget
// ^AbstractScrollableWidget
virtual void did_scroll() override;
void request_repaint();