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

LibWeb: Fix computing_width of a block when LayoutMode::MaxContent

Browse source 
We had an issue with computing a width of a block in MaxContent
mode because we would set the width of the containing block to
infinity which would make everything in the try_compute_width
block infinity as well.

This adds a special case for width = 'auto' when
width_of_containing_block is infinity and removes the width of
containing block from the equation entirely.
This commit is contained in:
Enver Balalic 2022-04-03 12:51:32 +02:00 • committed by Andreas Kling
parent c1b311835b
commit d8ec9a5501
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -115,14 +115,13 @@ void BlockFormattingContext::compute_width(Box const& box, LayoutMode layout_mod
auto margin_left = CSS::Length::make_auto(); auto margin_left = CSS::Length::make_auto();
auto margin_right = CSS::Length::make_auto(); auto margin_right = CSS::Length::make_auto();
auto const padding_left = computed_values.padding().left.resolved(box, width_of_containing_block_as_length).resolved(box); auto padding_left = computed_values.padding().left.resolved(box, width_of_containing_block_as_length).resolved(box);
auto const padding_right = computed_values.padding().right.resolved(box, width_of_containing_block_as_length).resolved(box); auto padding_right = computed_values.padding().right.resolved(box, width_of_containing_block_as_length).resolved(box);
auto try_compute_width = [&](auto const& a_width) { auto try_compute_width = [&](auto const& a_width) {
CSS::Length width = a_width; CSS::Length width = a_width;
margin_left = computed_values.margin().left.resolved(box, width_of_containing_block_as_length).resolved(box); margin_left = computed_values.margin().left.resolved(box, width_of_containing_block_as_length).resolved(box);
margin_right = computed_values.margin().right.resolved(box, width_of_containing_block_as_length).resolved(box); margin_right = computed_values.margin().right.resolved(box, width_of_containing_block_as_length).resolved(box);
float total_px = computed_values.border_left().width + computed_values.border_right().width; float total_px = computed_values.border_left().width + computed_values.border_right().width;
for (auto& value : { margin_left, padding_left, width, padding_right, margin_right }) { for (auto& value : { margin_left, padding_left, width, padding_right, margin_right }) {
total_px += value.to_px(box); total_px += value.to_px(box);
@ -146,11 +145,26 @@ void BlockFormattingContext::compute_width(Box const& box, LayoutMode layout_mod
margin_left = zero_value; margin_left = zero_value;
if (margin_right.is_auto()) if (margin_right.is_auto())
margin_right = zero_value; margin_right = zero_value;
if (underflow_px >= 0) {
width = CSS::Length(underflow_px, CSS::Length::Type::Px); if (width_of_containing_block == INFINITY) {
// If width of containing block is infinity
// then we might as well behave like we don't have a containing block
// and remove it from the calculation. In that case, our width
// will end up being the sum of margin_*, padding_*, border_*
float sum_of_all = computed_values.border_left().width + computed_values.border_right().width;
for (const auto& value : { margin_left, padding_left, width, padding_right, margin_right }) {
sum_of_all += value.to_px(box);
}
width = CSS::Length(sum_of_all, CSS::Length::Type::Px);
} else { } else {
width = zero_value; if (underflow_px >= 0) {
margin_right = CSS::Length(margin_right.to_px(box) + underflow_px, CSS::Length::Type::Px); width = CSS::Length(underflow_px, CSS::Length::Type::Px);
} else {
width = zero_value;
margin_right = CSS::Length(margin_right.to_px(box) + underflow_px, CSS::Length::Type::Px);
}
} }
} else { } else {
if (!margin_left.is_auto() && !margin_right.is_auto()) { if (!margin_left.is_auto() && !margin_right.is_auto()) {
@ -184,7 +198,6 @@ void BlockFormattingContext::compute_width(Box const& box, LayoutMode layout_mod
float available_width = width_of_containing_block float available_width = width_of_containing_block
- margin_left.to_px(box) - computed_values.border_left().width - padding_left.to_px(box) - margin_left.to_px(box) - computed_values.border_left().width - padding_left.to_px(box)
- padding_right.to_px(box) - computed_values.border_right().width - margin_right.to_px(box); - padding_right.to_px(box) - computed_values.border_right().width - margin_right.to_px(box);
auto result = calculate_shrink_to_fit_widths(box); auto result = calculate_shrink_to_fit_widths(box);
// Then the shrink-to-fit width is: min(max(preferred minimum width, available width), preferred width). // Then the shrink-to-fit width is: min(max(preferred minimum width, available width), preferred width).