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

LibWeb: Implement "transferred size suggestion" for flex items

Browse source
This commit is contained in:
Andreas Kling 2022-06-22 18:05:28 +02:00
parent 910a44d5f2
commit 7953bd8391
2 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -654,6 +654,22 @@ float FlexFormattingContext::content_size_suggestion(FlexItem const& item) const
return calculate_min_and_max_content_height(item.box).min_content_size; return calculate_min_and_max_content_height(item.box).min_content_size;
} }
// https://drafts.csswg.org/css-flexbox-1/#transferred-size-suggestion
Optional<float> FlexFormattingContext::transferred_size_suggestion(FlexItem const& item) const
{
// If the item has a preferred aspect ratio and its preferred cross size is definite,
// then the transferred size suggestion is that size
// (clamped by its minimum and maximum cross sizes if they are definite), converted through the aspect ratio.
if (item.box.has_intrinsic_aspect_ratio() && has_definite_cross_size(item.box)) {
auto aspect_ratio = item.box.intrinsic_aspect_ratio().value();
// FIXME: Clamp cross size to min/max cross size before this conversion.
return resolved_definite_cross_size(item.box) * aspect_ratio;
}
// It is otherwise undefined.
return {};
}
// https://drafts.csswg.org/css-flexbox-1/#content-based-minimum-size // https://drafts.csswg.org/css-flexbox-1/#content-based-minimum-size
float FlexFormattingContext::content_based_minimum_size(FlexItem const& item) const float FlexFormattingContext::content_based_minimum_size(FlexItem const& item) const
{ {
@ -664,8 +680,13 @@ float FlexFormattingContext::content_based_minimum_size(FlexItem const& item) co
return min(specified_size_suggestion.value(), content_size_suggestion(item)); return min(specified_size_suggestion.value(), content_size_suggestion(item));
} }
// FIXME: otherwise, the smaller of its transferred size suggestion and its content size suggestion // otherwise, the smaller of its transferred size suggestion and its content size suggestion
// if the element is replaced and its transferred size suggestion exists; // if the element is replaced and its transferred size suggestion exists;
if (item.box.is_replaced_box()) {
if (auto transferred_size_suggestion = this->transferred_size_suggestion(item); transferred_size_suggestion.has_value()) {
return min(transferred_size_suggestion.value(), content_size_suggestion(item));
}
}
// otherwise its content size suggestion. // otherwise its content size suggestion.
return content_size_suggestion(item); return content_size_suggestion(item);

1
Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h
View file

@ -82,6 +82,7 @@ private:
float automatic_minimum_size(FlexItem const&) const; float automatic_minimum_size(FlexItem const&) const;
float content_based_minimum_size(FlexItem const&) const; float content_based_minimum_size(FlexItem const&) const;
Optional<float> specified_size_suggestion(FlexItem const&) const; Optional<float> specified_size_suggestion(FlexItem const&) const;
Optional<float> transferred_size_suggestion(FlexItem const&) const;
float content_size_suggestion(FlexItem const&) const; float content_size_suggestion(FlexItem const&) const;
void set_main_size(Box const&, float size); void set_main_size(Box const&, float size);