beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibWeb: Improve hypothetical flex item "auto" cross sizes

Browse source 
Take the used main size of the item into account (as available size)
when doing inner or intrinsic layout to determine the cross size.
This commit is contained in:
Andreas Kling 2023-01-07 18:08:31 +01:00
parent 244d4e19fa
commit dbbc75f8fd
Notes: sideshowbarker 2024-07-17 22:55:25 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/dbbc75f8fd
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1086,31 +1086,42 @@ void FlexFormattingContext::determine_hypothetical_cross_size_of_item(FlexItem&
if (computed_cross_size(item.box).is_auto()) {
// Item has automatic cross size, layout with "fit-content"
item.hypothetical_cross_size = css_clamp(calculate_fit_content_cross_size(item), clamp_min, clamp_max);
CSSPixels fit_content_cross_size = 0;
if (is_row_layout()) {
auto available_width = AvailableSize::make_definite(item.main_size);
auto available_height = AvailableSize::make_indefinite();
fit_content_cross_size = calculate_fit_content_height(item.box, AvailableSpace(available_width, available_height));
} else {
fit_content_cross_size = calculate_fit_content_width(item.box, m_available_space_for_items->space);
}
item.hypothetical_cross_size = css_clamp(fit_content_cross_size, clamp_min, clamp_max);
return;
}
// For indefinite cross sizes, we perform a throwaway layout and then measure it.
LayoutState throwaway_state(&m_state);
auto& containing_block_state = throwaway_state.get_mutable(flex_container());
if (is_row_layout()) {
containing_block_state.set_content_width(item.main_size);
} else {
containing_block_state.set_content_height(item.main_size);
}
auto& box_state = throwaway_state.get_mutable(item.box);
if (is_row_layout()) {
box_state.set_content_width(item.main_size);
} else {
box_state.set_content_height(item.main_size);
}
// Item has definite main size, layout with that as the used main 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);
independent_formatting_context->run(item.box, LayoutMode::Normal, m_available_space_for_items->space);
auto available_width = is_row_layout() ? AvailableSize::make_definite(item.main_size) : AvailableSize::make_indefinite();
auto available_height = is_row_layout() ? AvailableSize::make_indefinite() : AvailableSize::make_definite(item.main_size);
independent_formatting_context->run(item.box, LayoutMode::Normal, AvailableSpace(available_width, available_height));
auto automatic_cross_size = is_row_layout() ? independent_formatting_context->automatic_content_height()
: box_state.content_width();
: independent_formatting_context->automatic_content_width();
item.hypothetical_cross_size = css_clamp(automatic_cross_size, clamp_min, clamp_max);
}