mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-09 02:56:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

LibWeb: Use relative coordinates for available_space_for_line()

Browse source 
We were accidentally providing it with absolute Y-coordinates, messing
up stacked floating boxes that would otherwise intrude on each other.

Fixes #4160.
This commit is contained in:
Jelle Raaijmakers 2025-04-01 13:22:22 +02:00 • committed by Alexander Kalenik
commit 45905d6f7b
Notes: github-actions[bot] 2025-04-01 13:27:14 +00:00
3 changed files with 49 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Libraries/LibWeb/Layout/LineBuilder.cpp
View file

@ -133,14 +133,12 @@ CSSPixels LineBuilder::y_for_float_to_be_inserted_here(Box const& box)
HashMap<CSSPixels, AvailableSize> available_space_cache;
for (;;) {
Optional<CSSPixels> highest_intersection_bottom;
auto candidate_block_top_in_root = box_in_root_rect.y() + candidate_block_offset;
auto candidate_block_bottom_in_root = candidate_block_top_in_root + height;
auto candidate_block_bottom = candidate_block_offset + height;
m_context.parent().for_each_floating_box([&](auto const& float_box) {
auto float_box_top = float_box.margin_box_rect_in_root_coordinate_space.top();
auto float_box_bottom = float_box.margin_box_rect_in_root_coordinate_space.bottom();
if (float_box_bottom <= candidate_block_top_in_root)
auto float_box_top = float_box.margin_box_rect_in_root_coordinate_space.top() - box_in_root_rect.y();
auto float_box_bottom = float_box.margin_box_rect_in_root_coordinate_space.bottom() - box_in_root_rect.y();
if (float_box_bottom <= candidate_block_offset)
return IterationDecision::Continue;
auto intersection_test = [&](auto y_coordinate, auto top, auto bottom) {
@ -149,16 +147,14 @@ CSSPixels LineBuilder::y_for_float_to_be_inserted_here(Box const& box)
auto available_space = available_space_cache.ensure(y_coordinate, [&]() {
return m_context.available_space_for_line(y_coordinate);
});
if (width > available_space) {
auto bottom_relative = float_box_bottom - box_in_root_rect.y();
highest_intersection_bottom = min(highest_intersection_bottom.value_or(bottom_relative), bottom_relative);
}
if (width > available_space)
highest_intersection_bottom = min(highest_intersection_bottom.value_or(float_box_bottom), float_box_bottom);
};
intersection_test(float_box_top, candidate_block_top_in_root, candidate_block_bottom_in_root);
intersection_test(float_box_bottom, candidate_block_top_in_root, candidate_block_bottom_in_root);
intersection_test(candidate_block_top_in_root, float_box_top, float_box_bottom);
intersection_test(candidate_block_bottom_in_root, float_box_top, float_box_bottom);
intersection_test(float_box_top, candidate_block_offset, candidate_block_bottom);
intersection_test(float_box_bottom, candidate_block_offset, candidate_block_bottom);
intersection_test(candidate_block_offset, float_box_top, float_box_bottom);
intersection_test(candidate_block_bottom, float_box_top, float_box_bottom);
return IterationDecision::Continue;
});