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

LibWeb: Avoid creating an empty first line box in block containers

Browse source
This commit is contained in:
Andreas Kling 2022-01-20 19:06:25 +01:00
parent 251b2f49a2
commit 2b631cde45
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibWeb/Layout/InlineFormattingContext.cpp
View file

@ -158,7 +158,6 @@ void InlineFormattingContext::dimension_box_on_line(Box& box, LayoutMode layout_
void InlineFormattingContext::generate_line_boxes(LayoutMode layout_mode) void InlineFormattingContext::generate_line_boxes(LayoutMode layout_mode)
{ {
containing_block().line_boxes().clear(); containing_block().line_boxes().clear();
containing_block().ensure_last_line_box();
InlineLevelIterator iterator(containing_block(), layout_mode); InlineLevelIterator iterator(containing_block(), layout_mode);
LineBuilder line_builder(*this); LineBuilder line_builder(*this);

8
Userland/Libraries/LibWeb/Layout/LineBuilder.cpp
View file

@ -36,13 +36,13 @@ void LineBuilder::begin_new_line()
void LineBuilder::append_box(Box& box) void LineBuilder::append_box(Box& box)
{ {
m_context.containing_block().line_boxes().last().add_fragment(box, 0, 0, box.width(), box.height()); m_context.containing_block().ensure_last_line_box().add_fragment(box, 0, 0, box.width(), box.height());
m_max_height_on_current_line = max(m_max_height_on_current_line, box.height()); m_max_height_on_current_line = max(m_max_height_on_current_line, box.height());
} }
void LineBuilder::append_text_chunk(TextNode& text_node, size_t offset_in_node, size_t length_in_node, float width, float height) void LineBuilder::append_text_chunk(TextNode& text_node, size_t offset_in_node, size_t length_in_node, float width, float height)
{ {
m_context.containing_block().line_boxes().last().add_fragment(text_node, offset_in_node, length_in_node, width, height); m_context.containing_block().ensure_last_line_box().add_fragment(text_node, offset_in_node, length_in_node, width, height);
m_max_height_on_current_line = max(m_max_height_on_current_line, height); m_max_height_on_current_line = max(m_max_height_on_current_line, height);
} }
@ -54,7 +54,9 @@ bool LineBuilder::should_break(LayoutMode layout_mode, float next_item_width, bo
return true; return true;
if (layout_mode == LayoutMode::OnlyRequiredLineBreaks) if (layout_mode == LayoutMode::OnlyRequiredLineBreaks)
return false; return false;
auto current_line_width = m_context.containing_block().line_boxes().last().width(); auto current_line_width = 0.0f;
if (!m_context.containing_block().line_boxes().is_empty())
current_line_width = m_context.containing_block().line_boxes().last().width();
return (current_line_width + next_item_width) > m_available_width_for_current_line; return (current_line_width + next_item_width) > m_available_width_for_current_line;
} }