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

LibWeb: Allow BFC auto height calculation on any Layout::Box

Browse source 
This algorithm is reused in abspos sizing, and so should not be specific
to block containers (even if the name suggests it.)
This commit is contained in:
Andreas Kling 2023-01-23 14:45:52 +01:00
parent a1d37420d5
commit d5480a44e5
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp
View file

@ -387,7 +387,7 @@ static bool margins_collapse_through(Box const& box, LayoutState& state)
CSSPixels BlockFormattingContext::compute_auto_height_for_block_level_element(Box const& box, AvailableSpace const& available_space)
{
if (creates_block_formatting_context(box)) {
return compute_auto_height_for_block_formatting_context_root(verify_cast<BlockContainer>(box));
return compute_auto_height_for_block_formatting_context_root(box);
}
auto const& box_state = m_state.get(box);

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

@ -275,7 +275,7 @@ static CSSPixelSize solve_replaced_size_constraint(LayoutState const& state, CSS
}
// https://www.w3.org/TR/CSS22/visudet.html#root-height
CSSPixels FormattingContext::compute_auto_height_for_block_formatting_context_root(BlockContainer const& root) const
CSSPixels FormattingContext::compute_auto_height_for_block_formatting_context_root(Box const& root) const
{
// 10.6.7 'Auto' heights for block formatting context roots
Optional<CSSPixels> top;
@ -716,7 +716,7 @@ void FormattingContext::compute_height_for_absolutely_positioned_non_replaced_el
top = CSS::Length::make_px(static_position.y());
// and finally apply rule number three below.
height = CSS::Size::make_px(compute_auto_height_for_block_formatting_context_root(verify_cast<BlockContainer>(box)));
height = CSS::Size::make_px(compute_auto_height_for_block_formatting_context_root(box));
solve_for_bottom();
}
@ -761,7 +761,7 @@ void FormattingContext::compute_height_for_absolutely_positioned_non_replaced_el
return;
// then the height is based on the Auto heights for block formatting context roots,
height = CSS::Size::make_px(compute_auto_height_for_block_formatting_context_root(verify_cast<BlockContainer>(box)));
height = CSS::Size::make_px(compute_auto_height_for_block_formatting_context_root(box));
// and solve for top.
solve_for_top();
@ -783,7 +783,7 @@ void FormattingContext::compute_height_for_absolutely_positioned_non_replaced_el
return;
// then the height is based on the Auto heights for block formatting context roots,
height = CSS::Size::make_px(compute_auto_height_for_block_formatting_context_root(verify_cast<BlockContainer>(box)));
height = CSS::Size::make_px(compute_auto_height_for_block_formatting_context_root(box));
// and solve for bottom.
solve_for_bottom();

2
Userland/Libraries/LibWeb/Layout/FormattingContext.h
View file

@ -102,7 +102,7 @@ protected:
static CSSPixels tentative_width_for_replaced_element(LayoutState const&, ReplacedBox const&, CSS::Size const& computed_width, AvailableSpace const&);
static CSSPixels tentative_height_for_replaced_element(LayoutState const&, ReplacedBox const&, CSS::Size const& computed_height, AvailableSpace const&);
CSSPixels compute_auto_height_for_block_formatting_context_root(BlockContainer const&) const;
CSSPixels compute_auto_height_for_block_formatting_context_root(Box const&) const;
ShrinkToFitResult calculate_shrink_to_fit_widths(Box const&);