summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2022-07-07 12:39:24 +0200
committerAndreas Kling <kling@serenityos.org>2022-07-10 00:47:46 +0200
commit89e65e0ea13bdd410847d2729adbedd51c333864 (patch)
treeb5e5fe0d48ca7dd6779bfbffbfa4d1ca31b45e43
parent8eb022a57de55f214f482c0d8bb3d7e9ebefd324 (diff)
downloadserenity-89e65e0ea13bdd410847d2729adbedd51c333864.zip
LibWeb: Support flex item cross sizing based on intrinsic aspect ratio
This patch implements case B from the "determine the flex base size and hypothetical main size of each item" from the flexbox algorithm. https://drafts.csswg.org/css-flexbox-1/#algo-main-item
-rw-r--r--Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp28
-rw-r--r--Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h2
2 files changed, 27 insertions, 3 deletions
diff --git a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp
index 86464c33a5..ba915137ef 100644
--- a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp
+++ b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp
@@ -568,13 +568,35 @@ float FlexFormattingContext::calculate_indefinite_main_size(FlexItem const& item
return BlockFormattingContext::compute_theoretical_height(throwaway_state, item.box);
}
+// https://drafts.csswg.org/css-flexbox-1/#propdef-flex-basis
+CSS::FlexBasisData FlexFormattingContext::used_flex_basis_for_item(FlexItem const& item) const
+{
+ auto flex_basis = item.box.computed_values().flex_basis();
+
+ if (flex_basis.type == CSS::FlexBasis::Auto) {
+ // https://drafts.csswg.org/css-flexbox-1/#valdef-flex-basis-auto
+ // When specified on a flex item, the auto keyword retrieves the value of the main size property as the used flex-basis.
+ // If that value is itself auto, then the used value is content.
+ auto const& main_size = is_row_layout() ? item.box.computed_values().width() : item.box.computed_values().height();
+
+ if (main_size.is_auto()) {
+ flex_basis.type = CSS::FlexBasis::Content;
+ } else {
+ flex_basis.type = CSS::FlexBasis::LengthPercentage;
+ flex_basis.length_percentage = main_size;
+ }
+ }
+
+ return flex_basis;
+}
+
// https://www.w3.org/TR/css-flexbox-1/#algo-main-item
void FlexFormattingContext::determine_flex_base_size_and_hypothetical_main_size(FlexItem& flex_item)
{
auto& child_box = flex_item.box;
flex_item.flex_base_size = [&] {
- auto const& used_flex_basis = child_box.computed_values().flex_basis();
+ auto used_flex_basis = used_flex_basis_for_item(flex_item);
// A. If the item has a definite used flex basis, thatโ€™s the flex base size.
if (used_flex_basis.is_definite()) {
@@ -590,9 +612,9 @@ void FlexFormattingContext::determine_flex_base_size_and_hypothetical_main_size(
// - a definite cross size,
if (flex_item.box.has_intrinsic_aspect_ratio()
&& used_flex_basis.type == CSS::FlexBasis::Content
- && has_definite_cross_size(child_box)) {
- TODO();
+ && has_definite_cross_size(flex_item.box)) {
// flex_base_size is calculated from definite cross size and intrinsic aspect ratio
+ return resolved_definite_cross_size(flex_item.box) * flex_item.box.intrinsic_aspect_ratio().value();
}
// C. If the used flex basis is content or depends on its available space,
diff --git a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h
index 73f05d2296..50a365bba2 100644
--- a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h
+++ b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h
@@ -140,6 +140,8 @@ private:
[[nodiscard]] float calculate_main_min_content_contribution(FlexItem const&) const;
[[nodiscard]] float calculate_main_max_content_contribution(FlexItem const&) const;
+ CSS::FlexBasisData used_flex_basis_for_item(FlexItem const&) const;
+
FormattingState::NodeState& m_flex_container_state;
Vector<FlexLine> m_flex_lines;