mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-20 17:21:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

LibWeb: Don't add extra gap when placing flex items in reverse order

Browse source
This commit is contained in:
aplefull 2025-01-16 12:51:06 +01:00 • committed by Andreas Kling
parent ac9670fb55
commit 50445dc9ef
Notes: github-actions[bot] 2025-01-17 09:11:34 +00:00
3 changed files with 95 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Libraries/LibWeb/Layout/FlexFormattingContext.cpp
View file

@ -1394,7 +1394,7 @@ void FlexFormattingContext::distribute_any_remaining_free_space()
CSSPixels cursor_offset = initial_offset;
auto place_item = [&](FlexItem& item) {
auto place_item = [&](FlexItem& item, size_t index) {
// CSS-FLEXBOX-2: Account for gap between items.
auto amount_of_main_size_used = item.main_size.value()
+ item.margins.main_before
@ -1403,8 +1403,15 @@ void FlexFormattingContext::distribute_any_remaining_free_space()
+ item.margins.main_after
+ item.borders.main_after
+ item.padding.main_after
+ space_between_items
+ main_gap();
+ space_between_items;
if (!is_direction_reverse() && flex_region_render_cursor == FlexRegionRenderCursor::Right) {
if (index < flex_line.items.size() - 1) {
amount_of_main_size_used += main_gap();
}
} else {
amount_of_main_size_used += main_gap();
}
if (is_direction_reverse() && flex_region_render_cursor == FlexRegionRenderCursor::Right) {
item.main_offset = cursor_offset - item.main_size.value() - item.margins.main_after - item.borders.main_after - item.padding.main_after;
@ -1421,12 +1428,12 @@ void FlexFormattingContext::distribute_any_remaining_free_space()
if (flex_region_render_cursor == FlexRegionRenderCursor::Right) {
for (ssize_t i = flex_line.items.size() - 1; i >= 0; --i) {
auto& item = flex_line.items[i];
place_item(item);
place_item(item, i);
}
} else {
for (size_t i = 0; i < flex_line.items.size(); ++i) {
auto& item = flex_line.items[i];
place_item(item);
place_item(item, i);
}
}
}