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

LibWeb: Move FFC layout algorithm step 16 to a separate function

Browse source
This commit is contained in:
Andreas Kling 2021-10-13 22:25:39 +02:00
parent f401794d23
commit 9359df4be9
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -132,16 +132,8 @@ void FlexFormattingContext::run(Box& flex_container, LayoutMode)
// 15. Determine the flex container’s used cross size: // 15. Determine the flex container’s used cross size:
determine_flex_container_used_cross_size(flex_container, flex_lines, cross_min_size, cross_max_size); determine_flex_container_used_cross_size(flex_container, flex_lines, cross_min_size, cross_max_size);
// 16. Align all flex lines // 16. Align all flex lines (per align-content)
// FIXME: Support align-content align_all_flex_lines(flex_lines);
// FIXME: Support reverse
for (auto& flex_line : flex_lines) {
for (auto* flex_item : flex_line.items) {
set_main_size(flex_item->box, flex_item->main_size);
set_cross_size(flex_item->box, flex_item->cross_size);
set_offset(flex_item->box, flex_item->main_offset, flex_item->cross_offset);
}
}
} }
static void populate_specified_margins(FlexItem& item, CSS::FlexDirection flex_direction) static void populate_specified_margins(FlexItem& item, CSS::FlexDirection flex_direction)
@ -961,4 +953,18 @@ void FlexFormattingContext::determine_flex_container_used_cross_size(Box& flex_c
} }
} }
// https://www.w3.org/TR/css-flexbox-1/#algo-line-align
void FlexFormattingContext::align_all_flex_lines(Vector<FlexLine>& flex_lines)
{
// FIXME: Support align-content
// FIXME: Support reverse
for (auto& flex_line : flex_lines) {
for (auto* flex_item : flex_line.items) {
set_main_size(flex_item->box, flex_item->main_size);
set_cross_size(flex_item->box, flex_item->cross_size);
set_offset(flex_item->box, flex_item->main_offset, flex_item->cross_offset);
}
}
}
} }

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

@ -78,6 +78,8 @@ private:
void determine_flex_container_used_cross_size(Box& flex_container, Vector<FlexLine> const&, float cross_min_size, float cross_max_size); void determine_flex_container_used_cross_size(Box& flex_container, Vector<FlexLine> const&, float cross_min_size, float cross_max_size);
void align_all_flex_lines(Vector<FlexLine>&);
bool is_row_layout() const { return m_flex_direction == CSS::FlexDirection::Row || m_flex_direction == CSS::FlexDirection::RowReverse; } bool is_row_layout() const { return m_flex_direction == CSS::FlexDirection::Row || m_flex_direction == CSS::FlexDirection::RowReverse; }
CSS::FlexDirection m_flex_direction {}; CSS::FlexDirection m_flex_direction {};