LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-08 20:32:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Move mouse wheel handling from Paintable to PaintableBox

Browse Source 
It is only PaintableBox that can have scrollable overflow so it doesn't
make sense to have handle_mousewheel() implementation in Paintable.

Also new implementation of handle_mousewheel() takes in account overflow
limits from scrollable_overflow_rect().
This commit is contained in:
Aliaksandr Kalenik 2023-08-06 14:28:23 +02:00 committed by Andreas Kling
parent 55b5c61a79
commit c7673605bb
Notes: sideshowbarker 2024-07-17 09:47:09 +09:00 
Author: https://github.com/kalenikaliaksandr
Commit: https://github.com/SerenityOS/serenity/commit/c7673605bb
Pull-request: https://github.com/SerenityOS/serenity/pull/20395
Reviewed-by: https://github.com/MacDue
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Userland/Libraries/LibWeb/Painting/Paintable.cpp
View File

@ -34,19 +34,8 @@ Paintable::DispatchEventOfSameName Paintable::handle_mousemove(Badge<EventHandle
return DispatchEventOfSameName::Yes;
}
bool Paintable::handle_mousewheel(Badge<EventHandler>, CSSPixelPoint, unsigned, unsigned, int wheel_delta_x, int wheel_delta_y)
bool Paintable::handle_mousewheel(Badge<EventHandler>, CSSPixelPoint, unsigned, unsigned, int, int)
{
if (auto const* containing_block = this->containing_block()) {
if (!containing_block->is_scrollable())
return false;
auto new_offset = containing_block->scroll_offset();
new_offset.translate_by(wheel_delta_x, wheel_delta_y);
// FIXME: This const_cast is gross.
// FIXME: Scroll offset shouldn't live in the layout tree.
const_cast<Layout::Box*>(containing_block)->set_scroll_offset(new_offset);
return true;
}
return false;
}

11
Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
View File

@ -663,13 +663,16 @@ void PaintableWithLines::paint(PaintContext& context, PaintPhase phase) const
}
}
bool PaintableWithLines::handle_mousewheel(Badge<EventHandler>, CSSPixelPoint, unsigned, unsigned, int wheel_delta_x, int wheel_delta_y)
bool PaintableBox::handle_mousewheel(Badge<EventHandler>, CSSPixelPoint, unsigned, unsigned, int wheel_delta_x, int wheel_delta_y)
{
if (!layout_box().is_scrollable())
return false;
auto new_offset = layout_box().scroll_offset();
new_offset.translate_by(wheel_delta_x, wheel_delta_y);
layout_box().set_scroll_offset(new_offset);
auto max_x_offset = scrollable_overflow_rect()->width() - content_size().width();
auto max_y_offset = scrollable_overflow_rect()->height() - content_size().height();
auto current_offset = layout_box().scroll_offset();
auto new_offset_x = clamp(current_offset.x() + wheel_delta_x, 0, max_x_offset);
auto new_offset_y = clamp(current_offset.y() + wheel_delta_y, 0, max_y_offset);
layout_box().set_scroll_offset({ new_offset_x, new_offset_y });
return true;
}

3
Userland/Libraries/LibWeb/Painting/PaintableBox.h
View File

@ -126,6 +126,8 @@ public:
virtual Optional<HitTestResult> hit_test(CSSPixelPoint, HitTestType) const override;
virtual bool handle_mousewheel(Badge<EventHandler>, CSSPixelPoint, unsigned buttons, unsigned modifiers, int wheel_delta_x, int wheel_delta_y) override;
void invalidate_stacking_context();
bool is_out_of_view(PaintContext&) const;
@ -235,7 +237,6 @@ public:
virtual void paint(PaintContext&, PaintPhase) const override;
virtual bool wants_mouse_events() const override { return false; }
virtual bool handle_mousewheel(Badge<EventHandler>, CSSPixelPoint, unsigned buttons, unsigned modifiers, int wheel_delta_x, int wheel_delta_y) override;
virtual Optional<HitTestResult> hit_test(CSSPixelPoint, HitTestType) const override;