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

LibWeb: Always include floats when computing height:auto for blocks

Browse source 
I'm not sure why we had two modes for this, but floats should always be
included in the auto height AFAICT.
This commit is contained in:
Andreas Kling 2022-03-01 18:51:25 +01:00
parent 6478b460fb
commit 56df05ae44
3 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -310,7 +310,7 @@ float BlockFormattingContext::compute_theoretical_height(FormattingState const&
if (!box.computed_values().height().has_value() if (!box.computed_values().height().has_value()
|| (box.computed_values().height()->is_length() && box.computed_values().height()->length().is_auto()) || (box.computed_values().height()->is_length() && box.computed_values().height()->length().is_auto())
|| (computed_values.height().has_value() && computed_values.height()->is_percentage() && !is_absolute(containing_block.computed_values().height()))) { || (computed_values.height().has_value() && computed_values.height()->is_percentage() && !is_absolute(containing_block.computed_values().height()))) {
height = compute_auto_height_for_block_level_element(state, box, ConsiderFloats::No); height = compute_auto_height_for_block_level_element(state, box);
} else { } else {
height = computed_values.height().has_value() ? computed_values.height()->resolved(box, containing_block_height).to_px(box) : 0; height = computed_values.height().has_value() ? computed_values.height()->resolved(box, containing_block_height).to_px(box) : 0;
} }

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

@ -206,7 +206,7 @@ static Gfx::FloatSize solve_replaced_size_constraint(FormattingState const& stat
return { w, h }; return { w, h };
} }
float FormattingContext::compute_auto_height_for_block_level_element(FormattingState const& state, Box const& box, ConsiderFloats consider_floats) float FormattingContext::compute_auto_height_for_block_level_element(FormattingState const& state, Box const& box)
{ {
Optional<float> top; Optional<float> top;
Optional<float> bottom; Optional<float> bottom;
@ -250,24 +250,22 @@ float FormattingContext::compute_auto_height_for_block_level_element(FormattingS
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
if (consider_floats == ConsiderFloats::Yes) { // In addition, if the element has any floating descendants
// In addition, if the element has any floating descendants // whose bottom margin edge is below the element's bottom content edge,
// whose bottom margin edge is below the element's bottom content edge, // then the height is increased to include those edges.
// then the height is increased to include those edges. box.for_each_child_of_type<Box>([&](Layout::Box& child_box) {
box.for_each_child_of_type<Box>([&](Layout::Box& child_box) { if (!child_box.is_floating())
if (!child_box.is_floating())
return IterationDecision::Continue;
auto const& child_box_state = state.get(child_box);
float child_box_bottom = child_box_state.offset.y() + child_box_state.content_height + child_box_state.margin_box_bottom();
if (!bottom.has_value() || child_box_bottom > bottom.value())
bottom = child_box_bottom;
return IterationDecision::Continue; return IterationDecision::Continue;
});
} auto const& child_box_state = state.get(child_box);
float child_box_bottom = child_box_state.offset.y() + child_box_state.content_height + child_box_state.margin_box_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);
} }

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

@ -58,11 +58,7 @@ protected:
static float tentative_width_for_replaced_element(FormattingState const&, ReplacedBox const&, CSS::Length const& width); static float tentative_width_for_replaced_element(FormattingState const&, ReplacedBox const&, CSS::Length const& width);
static float tentative_height_for_replaced_element(FormattingState const&, ReplacedBox const&, CSS::Length const& height); static float tentative_height_for_replaced_element(FormattingState const&, ReplacedBox const&, CSS::Length const& height);
enum ConsiderFloats { static float compute_auto_height_for_block_level_element(FormattingState const&, Box const&);
Yes,
No,
};
static float compute_auto_height_for_block_level_element(FormattingState const&, Box const&, ConsiderFloats consider_floats = ConsiderFloats::Yes);
ShrinkToFitResult calculate_shrink_to_fit_widths(Box const&); ShrinkToFitResult calculate_shrink_to_fit_widths(Box const&);