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

Ladybird: Send mouse wheel events to WebContent process

Browse source 
Rather than directing mouse wheel events to the QAbstractScrollArea,
send them to the WebContent process, allowing it to determine if they
should be consumed by the element or used for page scrolling.
This commit is contained in:
Aliaksandr Kalenik 2023-08-04 20:47:35 +02:00 • committed by Andreas Kling
parent 3a82f2d7ec
commit 6631314874
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Ladybird/WebContentView.cpp
View file

@ -81,7 +81,7 @@ WebContentView::WebContentView(StringView webdriver_content_ipc_path, WebView::E
WebContentView::~WebContentView() = default;
unsigned get_button_from_qt_event(QMouseEvent const& event)
unsigned get_button_from_qt_event(QSinglePointEvent const& event)
{
if (event.button() == Qt::MouseButton::LeftButton)
return 1;
@ -96,7 +96,7 @@ unsigned get_button_from_qt_event(QMouseEvent const& event)
return 0;
}
unsigned get_buttons_from_qt_event(QMouseEvent const& event)
unsigned get_buttons_from_qt_event(QSinglePointEvent const& event)
{
unsigned buttons = 0;
if (event.buttons() & Qt::MouseButton::LeftButton)
@ -112,7 +112,7 @@ unsigned get_buttons_from_qt_event(QMouseEvent const& event)
return buttons;
}
unsigned get_modifiers_from_qt_mouse_event(QMouseEvent const& event)
unsigned get_modifiers_from_qt_mouse_event(QSinglePointEvent const& event)
{
unsigned modifiers = 0;
if (event.modifiers() & Qt::Modifier::ALT)
@ -278,7 +278,18 @@ KeyCode get_keycode_from_qt_keyboard_event(QKeyEvent const& event)
void WebContentView::wheelEvent(QWheelEvent* event)
{
if (!event->modifiers().testFlag(Qt::ControlModifier)) {
QAbstractScrollArea::wheelEvent(event);
Gfx::IntPoint position(event->position().x() / m_inverse_pixel_scaling_ratio, event->position().y() / m_inverse_pixel_scaling_ratio);
auto button = get_button_from_qt_event(*event);
auto buttons = get_buttons_from_qt_event(*event);
auto modifiers = get_modifiers_from_qt_mouse_event(*event);
auto num_pixels = -event->pixelDelta() / m_inverse_pixel_scaling_ratio;
auto num_degrees = -event->angleDelta() / 8;
if (!num_pixels.isNull()) {
client().async_mouse_wheel(to_content_position(position), button, buttons, modifiers, num_pixels.x(), num_pixels.y());
} else if (!num_degrees.isNull()) {
client().async_mouse_wheel(to_content_position(position), button, buttons, modifiers, num_degrees.x(), num_degrees.y());
}
event->accept();
return;
}