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

LibWeb: Fix flex & abspos alignment issues

Browse source 
Fixes a couple of weirder interactions between justify-content and
flex-direction related to reverse direction packing and how margins
are set.
This commit is contained in:
Sebastian Zaha 2023-07-10 17:52:43 +02:00 • committed by Andreas Kling
parent e1cf868e6e
commit 17d23e76e5
2 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2193,18 +2193,17 @@ CSSPixelPoint FlexFormattingContext::calculate_static_position(Box const& box) c
CSSPixels main_offset = 0;
switch (flex_container().computed_values().justify_content()) {
case CSS::JustifyContent::Start:
pack_from_end = false;
break;
case CSS::JustifyContent::FlexStart:
main_offset = 0;
case CSS::JustifyContent::SpaceBetween:
pack_from_end = is_direction_reverse();
break;
case CSS::JustifyContent::End:
case CSS::JustifyContent::FlexEnd:
main_offset = -main_border_before - main_border_after;
pack_from_end = !is_direction_reverse();
pack_from_end = true;
break;
case CSS::JustifyContent::SpaceBetween:
pack_from_end = false;
main_offset = 0;
case CSS::JustifyContent::FlexEnd:
pack_from_end = !is_direction_reverse();
break;
case CSS::JustifyContent::Center:
case CSS::JustifyContent::SpaceAround:
@ -2223,7 +2222,7 @@ CSSPixelPoint FlexFormattingContext::calculate_static_position(Box const& box) c
}
if (pack_from_end)
main_offset += inner_main_size(flex_container()) - inner_main_size(box);
main_offset += inner_main_size(flex_container()) - inner_main_size(box) - main_border_before - main_border_after;
auto static_position_offset = is_row_layout() ? CSSPixelPoint { main_offset, cross_offset } : CSSPixelPoint { cross_offset, main_offset };