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

LibWeb: Always pass *some* available width to flex item intrinsic sizing

Browse source 
If we have determined a definite width for the item, we can use that.
Otherwise, use the "space available for items" width as available width.
This commit is contained in:
Andreas Kling 2023-01-25 13:03:38 +01:00
parent 1ea276bf6d
commit 0bbc54c200
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1849,7 +1849,7 @@ CSSPixels FlexFormattingContext::calculate_min_content_main_size(FlexItem const&
if (is_row_layout()) { if (is_row_layout()) {
return calculate_min_content_width(item.box); return calculate_min_content_width(item.box);
} }
return calculate_min_content_height(item.box, item.cross_size.has_value() ? AvailableSize::make_definite(item.cross_size.value()) : AvailableSize::make_indefinite()); return calculate_min_content_height(item.box, item.cross_size.has_value() ? AvailableSize::make_definite(item.cross_size.value()) : m_available_space_for_items->cross);
} }
CSSPixels FlexFormattingContext::calculate_max_content_main_size(FlexItem const& item) const CSSPixels FlexFormattingContext::calculate_max_content_main_size(FlexItem const& item) const
@ -1857,7 +1857,7 @@ CSSPixels FlexFormattingContext::calculate_max_content_main_size(FlexItem const&
if (is_row_layout()) { if (is_row_layout()) {
return calculate_max_content_width(item.box); return calculate_max_content_width(item.box);
} }
return calculate_max_content_height(item.box, item.cross_size.has_value() ? AvailableSize::make_definite(item.cross_size.value()) : AvailableSize::make_indefinite()); return calculate_max_content_height(item.box, item.cross_size.has_value() ? AvailableSize::make_definite(item.cross_size.value()) : m_available_space_for_items->cross);
} }
CSSPixels FlexFormattingContext::calculate_fit_content_main_size(FlexItem const& item) const CSSPixels FlexFormattingContext::calculate_fit_content_main_size(FlexItem const& item) const
@ -1875,7 +1875,7 @@ CSSPixels FlexFormattingContext::calculate_fit_content_cross_size(FlexItem const
CSSPixels FlexFormattingContext::calculate_min_content_cross_size(FlexItem const& item) const CSSPixels FlexFormattingContext::calculate_min_content_cross_size(FlexItem const& item) const
{ {
if (is_row_layout()) { if (is_row_layout()) {
return calculate_min_content_height(item.box, item.main_size.has_value() ? AvailableSize::make_definite(item.main_size.value()) : AvailableSize::make_indefinite()); return calculate_min_content_height(item.box, item.main_size.has_value() ? AvailableSize::make_definite(item.main_size.value()) : m_available_space_for_items->main);
} }
return calculate_min_content_width(item.box); return calculate_min_content_width(item.box);
} }
@ -1883,7 +1883,7 @@ CSSPixels FlexFormattingContext::calculate_min_content_cross_size(FlexItem const
CSSPixels FlexFormattingContext::calculate_max_content_cross_size(FlexItem const& item) const CSSPixels FlexFormattingContext::calculate_max_content_cross_size(FlexItem const& item) const
{ {
if (is_row_layout()) { if (is_row_layout()) {
return calculate_max_content_height(item.box, item.main_size.has_value() ? AvailableSize::make_definite(item.main_size.value()) : AvailableSize::make_indefinite()); return calculate_max_content_height(item.box, item.main_size.has_value() ? AvailableSize::make_definite(item.main_size.value()) : m_available_space_for_items->main);
} }
return calculate_max_content_width(item.box); return calculate_max_content_width(item.box);
} }