eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-05-05 06:32:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Layout list item marker before setting offset in block container

Browse Source 
Before this change we would only account for the size of the list item
itself rather than it's marker which if the marker was larger than it's
associated list item could lead to markers overlapping
This commit is contained in:
Callum Law
2026-02-09 16:09:41 +13:00
committed by Jelle Raaijmakers
parent 66566bf13b
commit fd74fa024f
Notes: github-actions[bot] 2026-02-11 10:05:45 +00:00 
Author: https://github.com/Calme1709
Commit: https://github.com/LadybirdBrowser/ladybird/commit/fd74fa024f7
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/7845
Reviewed-by: https://github.com/gmta ✅
3 changed files with 84 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Libraries/LibWeb/Layout/BlockFormattingContext.cpp
View File

@@ -929,6 +929,12 @@ void BlockFormattingContext::layout_block_level_box(Box const& box, BlockContain
resolve_used_height_if_treated_as_auto(box, available_space_for_height_resolution, independent_formatting_context);
}
// Now that our children are formatted we place the ListItemBox with the left space we remembered.
if (is_list_item_box_without_css_content)
// The marker pseudo-element will be created from a ListItemMarkerBox
layout_list_item_marker(*li_box, left_space_before_children_formatted);
// Otherwise, it will be a dealt with as a generic pseudo-element with the content of the ::marker pseudo-element.
if (independent_formatting_context || !margins_collapse_through(box, m_state)) {
if (!m_margin_state.box_last_in_flow_child_margin_bottom_collapsed()) {
m_margin_state.reset();
@@ -943,12 +949,6 @@ void BlockFormattingContext::layout_block_level_box(Box const& box, BlockContain
auto const& block_container_state = m_state.get(block_container);
compute_inset(box, content_box_rect(block_container_state).size());
// Now that our children are formatted we place the ListItemBox with the left space we remembered.
if (is_list_item_box_without_css_content)
// The marker pseudo-element will be created from a ListItemMarkerBox
layout_list_item_marker(*li_box, left_space_before_children_formatted);
// Otherwise, it will be a dealt with as a generic pseudo-element with the content of the ::marker pseudo-element.
bottom_of_lowest_margin_box = max(bottom_of_lowest_margin_box, box_state.offset.y() + box_state.content_height() + box_state.margin_box_bottom());
if (independent_formatting_context)