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

LibWeb: Put available space information in an FFC member

Browse source 
This makes it easier for each step of the flex layout algorithm to
access this information.
This commit is contained in:
Andreas Kling 2022-02-27 12:19:58 +01:00
parent 88302b0dca
commit b904bff838
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,9 +97,7 @@ void FlexFormattingContext::run(Box const& run_box, LayoutMode)
bool main_is_constrained = false; bool main_is_constrained = false;
bool cross_is_constrained = false; bool cross_is_constrained = false;
bool main_size_is_infinite = false; bool main_size_is_infinite = false;
auto available_space = determine_available_main_and_cross_space(main_size_is_infinite, main_is_constrained, cross_is_constrained, main_min_size, main_max_size, cross_min_size, cross_max_size); determine_available_main_and_cross_space(main_size_is_infinite, main_is_constrained, cross_is_constrained, main_min_size, main_max_size, cross_min_size, cross_max_size);
auto main_available_size = available_space.main;
[[maybe_unused]] auto cross_available_size = available_space.cross;
// 3. Determine the flex base size and hypothetical main size of each item // 3. Determine the flex base size and hypothetical main size of each item
for (auto& flex_item : m_flex_items) { for (auto& flex_item : m_flex_items) {
@ -107,14 +105,14 @@ void FlexFormattingContext::run(Box const& run_box, LayoutMode)
} }
// 4. Determine the main size of the flex container // 4. Determine the main size of the flex container
determine_main_size_of_flex_container(main_is_constrained, main_size_is_infinite, main_available_size, main_min_size, main_max_size); determine_main_size_of_flex_container(main_is_constrained, main_size_is_infinite, m_available_space->main, main_min_size, main_max_size);
// 5. Collect flex items into flex lines: // 5. Collect flex items into flex lines:
// After this step no additional items are to be added to flex_lines or any of its items! // After this step no additional items are to be added to flex_lines or any of its items!
collect_flex_items_into_flex_lines(main_available_size); collect_flex_items_into_flex_lines(m_available_space->main);
// 6. Resolve the flexible lengths // 6. Resolve the flexible lengths
resolve_flexible_lengths(main_available_size); resolve_flexible_lengths(m_available_space->main);
// Cross Size Determination // Cross Size Determination
// 7. Determine the hypothetical cross size of each item // 7. Determine the hypothetical cross size of each item
@ -135,7 +133,7 @@ void FlexFormattingContext::run(Box const& run_box, LayoutMode)
determine_used_cross_size_of_each_flex_item(); determine_used_cross_size_of_each_flex_item();
// 12. Distribute any remaining free space. // 12. Distribute any remaining free space.
distribute_any_remaining_free_space(main_available_size); distribute_any_remaining_free_space(m_available_space->main);
// 13. Resolve cross-axis auto margins. // 13. Resolve cross-axis auto margins.
// FIXME: This // FIXME: This
@ -406,7 +404,7 @@ float FlexFormattingContext::sum_of_margin_padding_border_in_main_axis(Box const
} }
// https://www.w3.org/TR/css-flexbox-1/#algo-available // https://www.w3.org/TR/css-flexbox-1/#algo-available
FlexFormattingContext::AvailableSpace FlexFormattingContext::determine_available_main_and_cross_space(bool& main_size_is_infinite, bool& main_is_constrained, bool& cross_is_constrained, float& main_min_size, float& main_max_size, float& cross_min_size, float& cross_max_size) const void FlexFormattingContext::determine_available_main_and_cross_space(bool& main_size_is_infinite, bool& main_is_constrained, bool& cross_is_constrained, float& main_min_size, float& main_max_size, float& cross_min_size, float& cross_max_size)
{ {
auto containing_block_effective_main_size = [&](Box const& box) { auto containing_block_effective_main_size = [&](Box const& box) {
auto& containing_block = *box.containing_block(); auto& containing_block = *box.containing_block();
@ -475,7 +473,7 @@ FlexFormattingContext::AvailableSpace FlexFormattingContext::determine_available
cross_available_space = cross_max_size; cross_available_space = cross_max_size;
} }
return AvailableSpace { .main = main_available_space, .cross = cross_available_space }; m_available_space = AvailableSpace { .main = main_available_space, .cross = cross_available_space };
} }
float FlexFormattingContext::layout_for_maximum_main_size(Box const& box) float FlexFormattingContext::layout_for_maximum_main_size(Box const& box)

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

@ -85,11 +85,7 @@ private:
void generate_anonymous_flex_items(); void generate_anonymous_flex_items();
struct AvailableSpace { void determine_available_main_and_cross_space(bool& main_size_is_infinite, bool& main_is_constrained, bool& cross_is_constrained, float& main_min_size, float& main_max_size, float& cross_min_size, float& cross_max_size);
float main { 0 };
float cross { 0 };
};
AvailableSpace determine_available_main_and_cross_space(bool& main_size_is_infinite, bool& main_is_constrained, bool& cross_is_constrained, float& main_min_size, float& main_max_size, float& cross_min_size, float& cross_max_size) const;
float layout_for_maximum_main_size(Box const&); float layout_for_maximum_main_size(Box const&);
void determine_flex_base_size_and_hypothetical_main_size(FlexItem&); void determine_flex_base_size_and_hypothetical_main_size(FlexItem&);
@ -124,6 +120,12 @@ private:
Vector<FlexLine> m_flex_lines; Vector<FlexLine> m_flex_lines;
Vector<FlexItem> m_flex_items; Vector<FlexItem> m_flex_items;
CSS::FlexDirection m_flex_direction {}; CSS::FlexDirection m_flex_direction {};
struct AvailableSpace {
float main { 0 };
float cross { 0 };
};
Optional<AvailableSpace> m_available_space;
}; };
} }