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

LibWeb: Use fit-content size for flex items with indefinite cross size

Browse source
This commit is contained in:
Andreas Kling 2022-07-12 20:14:42 +02:00
parent 04cc837db9
commit 7d7d5f0b1b
1 changed files with 1 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1004,29 +1004,7 @@ void FlexFormattingContext::determine_hypothetical_cross_size_of_item(FlexItem&
item.hypothetical_cross_size = box_state.content_width; item.hypothetical_cross_size = box_state.content_width;
} else { } else {
// Item has indefinite main size, layout with "fit-content" // Item has indefinite main size, layout with "fit-content"
item.hypothetical_cross_size = calculate_fit_content_cross_size(item);
// If we're in a column layout and looking for the width, just use the fit-content width.
if (!is_row_layout()) {
item.hypothetical_cross_size = calculate_fit_content_width(item.box, m_available_space->cross);
return;
}
// We're in a row layout, looking for the height. Figure out the fit-content width,
// then layout with that and see what height comes out of it.
float fit_content_main_size = calculate_fit_content_width(item.box, m_available_space->main);
FormattingState throwaway_state(&m_state);
auto& box_state = throwaway_state.get_mutable(item.box);
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);
box_state.content_width = fit_content_main_size;
independent_formatting_context->run(item.box, LayoutMode::Normal);
item.hypothetical_cross_size = BlockFormattingContext::compute_theoretical_height(throwaway_state, item.box);
} }
} }