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

LibWeb: Honor preferred size as intrinsic cross size of flex items

Browse source 
I'm not 100% sure this is on-spec, but it seems to me that flex items
that have a specified non-auto cross size should honor that value in
its min-content and max-contribution.
This commit is contained in:
Andreas Kling 2022-07-11 18:50:05 +02:00
parent 9cae06de09
commit 4493702fb2
1 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1484,22 +1484,46 @@ float FlexFormattingContext::calculate_main_max_content_contribution(FlexItem co
float FlexFormattingContext::calculate_cross_min_content_contribution(FlexItem const& flex_item) const float FlexFormattingContext::calculate_cross_min_content_contribution(FlexItem const& flex_item) const
{ {
auto outer_min_cross_size = [&] {
auto inner_cross_size = calculate_min_content_cross_size(flex_item); auto inner_cross_size = calculate_min_content_cross_size(flex_item);
auto outer_cross_size = inner_cross_size auto outer_cross_size = inner_cross_size
+ flex_item.margins.cross_before + flex_item.margins.cross_after + flex_item.margins.cross_before + flex_item.margins.cross_after
+ flex_item.borders.cross_before + flex_item.borders.cross_after + flex_item.borders.cross_before + flex_item.borders.cross_after
+ flex_item.padding.cross_before + flex_item.padding.cross_after; + flex_item.padding.cross_before + flex_item.padding.cross_after;
return outer_cross_size; return outer_cross_size;
}();
if (!has_definite_cross_size(flex_item.box)) {
return outer_min_cross_size;
}
auto clamp_min = has_cross_min_size(flex_item.box) ? specified_cross_min_size(flex_item.box) : 0;
auto clamp_max = has_cross_max_size(flex_item.box) ? specified_cross_max_size(flex_item.box) : NumericLimits<float>::max();
auto unclamped_preferred_size = resolved_definite_cross_size(flex_item.box);
auto clamped_preferred_size = css_clamp(unclamped_preferred_size, clamp_min, clamp_max);
return max(outer_min_cross_size, clamped_preferred_size);
} }
float FlexFormattingContext::calculate_cross_max_content_contribution(FlexItem const& flex_item) const float FlexFormattingContext::calculate_cross_max_content_contribution(FlexItem const& flex_item) const
{ {
auto outer_max_content_size = [&] {
auto inner_cross_size = calculate_max_content_cross_size(flex_item); auto inner_cross_size = calculate_max_content_cross_size(flex_item);
auto outer_cross_size = inner_cross_size auto outer_cross_size = inner_cross_size
+ flex_item.margins.cross_before + flex_item.margins.cross_after + flex_item.margins.cross_before + flex_item.margins.cross_after
+ flex_item.borders.cross_before + flex_item.borders.cross_after + flex_item.borders.cross_before + flex_item.borders.cross_after
+ flex_item.padding.cross_before + flex_item.padding.cross_after; + flex_item.padding.cross_before + flex_item.padding.cross_after;
return outer_cross_size; return outer_cross_size;
}();
if (!has_definite_cross_size(flex_item.box)) {
return outer_max_content_size;
}
auto clamp_min = has_cross_min_size(flex_item.box) ? specified_cross_min_size(flex_item.box) : 0;
auto clamp_max = has_cross_max_size(flex_item.box) ? specified_cross_max_size(flex_item.box) : NumericLimits<float>::max();
auto unclamped_preferred_size = resolved_definite_cross_size(flex_item.box);
auto clamped_preferred_size = css_clamp(unclamped_preferred_size, clamp_min, clamp_max);
return max(outer_max_content_size, clamped_preferred_size);
} }
float FlexFormattingContext::calculate_min_content_main_size(FlexItem const& item) const float FlexFormattingContext::calculate_min_content_main_size(FlexItem const& item) const