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

LibWeb: Include floats in height:auto for BFC root with inline children

Browse source 
BFC roots with children_are_inline()==true can still have floating boxes
as well. children_are_inline() is only concerned with in-flow children.

For this reason, we have to always consider floats when calculating
height:auto for BFC roots.
This commit is contained in:
Andreas Kling 2022-03-26 00:11:37 +01:00
parent 618273b48d
commit 925c34cf43
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Userland/Libraries/LibWeb/Layout/FormattingContext.cpp
View file

@ -293,28 +293,30 @@ float FormattingContext::compute_auto_height_for_block_formatting_context_root(F
if (!top.has_value() || child_box_top < top.value()) if (!top.has_value() || child_box_top < top.value())
top = child_box_top; top = child_box_top;
if (!bottom.has_value() || child_box_bottom > bottom.value())
bottom = child_box_bottom;
return IterationDecision::Continue;
});
// In addition, if the element has any floating descendants
// whose bottom margin edge is below the element's bottom content edge,
// then the height is increased to include those edges.
root.for_each_child_of_type<Box>([&](Layout::Box& child_box) {
if (!child_box.is_floating())
return IterationDecision::Continue;
auto const& child_box_state = state.get(child_box);
// FIXME: We're ignoring negative margins here, figure out the correct thing to do.
float child_box_bottom = child_box_state.offset.y() + child_box_state.content_height + child_box_state.border_box_bottom() + max(0, child_box_state.margin_bottom);
if (!bottom.has_value() || child_box_bottom > bottom.value()) if (!bottom.has_value() || child_box_bottom > bottom.value())
bottom = child_box_bottom; bottom = child_box_bottom;
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
} }
// In addition, if the element has any floating descendants
// whose bottom margin edge is below the element's bottom content edge,
// then the height is increased to include those edges.
root.for_each_child_of_type<Box>([&](Layout::Box& child_box) {
if (!child_box.is_floating())
return IterationDecision::Continue;
auto const& child_box_state = state.get(child_box);
// FIXME: We're ignoring negative margins here, figure out the correct thing to do.
float child_box_bottom = child_box_state.offset.y() + child_box_state.content_height + child_box_state.border_box_bottom() + max(0, child_box_state.margin_bottom);
if (!bottom.has_value() || child_box_bottom > bottom.value())
bottom = child_box_bottom;
return IterationDecision::Continue;
});
return bottom.value_or(0) - top.value_or(0); return bottom.value_or(0) - top.value_or(0);
} }