mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 02:12:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Use max-content main size for flex items w/ definite cross size

Browse source 
If the main size is indefinite, that is.
This commit is contained in:
Andreas Kling 2022-07-09 21:35:03 +02:00
parent e78282aebb
commit 7b4a86ab80
1 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -522,27 +522,8 @@ float FlexFormattingContext::calculate_indefinite_main_size(FlexItem const& item
{ {
VERIFY(!has_definite_main_size(item.box)); VERIFY(!has_definite_main_size(item.box));
if (has_definite_cross_size(item.box)) { if (has_definite_cross_size(item.box))
// For indefinite main sizes, we perform a throwaway layout and then measure it. return calculate_max_content_main_size(item);
FormattingState throwaway_state(&m_state);
auto& box_state = throwaway_state.get_mutable(item.box);
// Item has definite cross size, layout with that as the used cross size.
auto independent_formatting_context = create_independent_formatting_context_if_needed(throwaway_state, item.box);
// NOTE: Flex items should always create an independent formatting context!
VERIFY(independent_formatting_context);
if (is_row_layout()) {
box_state.content_height = resolved_definite_cross_size(item.box);
} else {
box_state.content_width = resolved_definite_cross_size(item.box);
}
independent_formatting_context->run(item.box, LayoutMode::Normal);
if (is_row_layout())
return box_state.content_width;
return BlockFormattingContext::compute_theoretical_height(throwaway_state, item.box);
}
// Item has indefinite cross size, layout with "fit-content" // Item has indefinite cross size, layout with "fit-content"