RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 03:08:13 +00:00
Code Issues Activity Actions

LibWeb: Move scroll_offset() from Layout::Box to PaintableBox

Browse source 
Nodes in layout tree should not be aware of scroll state.
This commit is contained in:
Aliaksandr Kalenik 2023-08-06 20:51:46 +02:00 • committed by Andreas Kling
parent 23a07a8ab6
commit 5b7926fa53
6 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibWeb/DOM/Element.cpp
View file

@ -943,11 +943,9 @@ double Element::scroll_top() const
if (!layout_node() || !is<Layout::Box>(layout_node()))
return 0.0;
auto const* box = static_cast<Layout::Box const*>(layout_node());
// 9. Return the y-coordinate of the scrolling area at the alignment point with the top of the padding edge of the element.
// FIXME: Is this correct?
return box->scroll_offset().y().to_double();
return paintable_box()->scroll_offset().y().to_double();
}
double Element::scroll_left() const
@ -985,11 +983,9 @@ double Element::scroll_left() const
if (!layout_node() || !is<Layout::Box>(layout_node()))
return 0.0;
auto const* box = static_cast<Layout::Box const*>(layout_node());
// 9. Return the x-coordinate of the scrolling area at the alignment point with the left of the padding edge of the element.
// FIXME: Is this correct?
return box->scroll_offset().x().to_double();
return paintable_box()->scroll_offset().x().to_double();
}
// https://drafts.csswg.org/cssom-view/#dom-element-scrollleft
@ -1056,7 +1052,7 @@ void Element::set_scroll_left(double x)
// 11. Scroll the element to x,scrollTop, with the scroll behavior being "auto".
// FIXME: Implement this in terms of calling "scroll the element".
auto scroll_offset = box->scroll_offset();
auto scroll_offset = paintable_box()->scroll_offset();
scroll_offset.set_x(static_cast<float>(x));
box->set_scroll_offset(scroll_offset);
}
@ -1124,7 +1120,7 @@ void Element::set_scroll_top(double y)
// 11. Scroll the element to scrollLeft,y, with the scroll behavior being "auto".
// FIXME: Implement this in terms of calling "scroll the element".
auto scroll_offset = box->scroll_offset();
auto scroll_offset = paintable_box()->scroll_offset();
scroll_offset.set_y(static_cast<float>(y));
box->set_scroll_offset(scroll_offset);
}