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

LibWeb: Dimension inline-block boxes before deciding about line breaks

Browse source 
We won't know if we need to break before the inline-block box until
after we've dimensioned it.
This commit is contained in:
Andreas Kling 2022-01-20 13:46:04 +01:00
parent 67b3f769fb
commit d3adc94ce8
5 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -169,8 +169,6 @@ void InlineFormattingContext::generate_line_boxes(LayoutMode layout_mode)
break; break;
auto& item = item_opt.value(); auto& item = item_opt.value();
line_builder.break_if_needed(layout_mode, item.width);
switch (item.type) { switch (item.type) {
case InlineLevelIterator::Item::Type::ForcedBreak: case InlineLevelIterator::Item::Type::ForcedBreak:
line_builder.break_line(); line_builder.break_line();
@ -178,11 +176,13 @@ void InlineFormattingContext::generate_line_boxes(LayoutMode layout_mode)
case InlineLevelIterator::Item::Type::Element: { case InlineLevelIterator::Item::Type::Element: {
auto& box = verify_cast<Layout::Box>(*item.node); auto& box = verify_cast<Layout::Box>(*item.node);
dimension_box_on_line(box, layout_mode); dimension_box_on_line(box, layout_mode);
line_builder.break_if_needed(layout_mode, box.width(), item.should_force_break);
line_builder.append_box(box); line_builder.append_box(box);
break; break;
} }
case InlineLevelIterator::Item::Type::Text: { case InlineLevelIterator::Item::Type::Text: {
auto& text_node = verify_cast<Layout::TextNode>(*item.node); auto& text_node = verify_cast<Layout::TextNode>(*item.node);
line_builder.break_if_needed(layout_mode, item.width, item.should_force_break);
line_builder.append_text_chunk( line_builder.append_text_chunk(
text_node, text_node,
item.offset_in_node, item.offset_in_node,

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

@ -62,6 +62,7 @@ Optional<InlineLevelIterator::Item> InlineLevelIterator::next(float available_wi
.offset_in_node = chunk.start, .offset_in_node = chunk.start,
.length_in_node = chunk.length, .length_in_node = chunk.length,
.width = chunk_width, .width = chunk_width,
.should_force_break = m_text_node_context->do_respect_linebreaks && chunk.has_breaking_newline,
}; };
return item; return item;

1
Userland/Libraries/LibWeb/Layout/InlineLevelIterator.h
View file

@ -31,6 +31,7 @@ public:
size_t offset_in_node { 0 }; size_t offset_in_node { 0 };
size_t length_in_node { 0 }; size_t length_in_node { 0 };
float width { 0.0f }; float width { 0.0f };
bool should_force_break { false };
}; };
explicit InlineLevelIterator(Layout::Box& container, LayoutMode layout_mode) explicit InlineLevelIterator(Layout::Box& container, LayoutMode layout_mode)

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

@ -46,9 +46,10 @@ void LineBuilder::append_text_chunk(TextNode& text_node, size_t offset_in_node,
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);
} }
void LineBuilder::break_if_needed(LayoutMode layout_mode, float next_item_width) void LineBuilder::break_if_needed(LayoutMode layout_mode, float next_item_width, bool should_force_break)
{ {
if (layout_mode == LayoutMode::AllPossibleLineBreaks if (layout_mode == LayoutMode::AllPossibleLineBreaks
|| should_force_break
|| (m_context.containing_block().line_boxes().last().width() + next_item_width) > m_available_width_for_current_line) || (m_context.containing_block().line_boxes().last().width() + next_item_width) > m_available_width_for_current_line)
break_line(); break_line();
} }

2
Userland/Libraries/LibWeb/Layout/LineBuilder.h
View file

@ -23,7 +23,7 @@ public:
void append_box(Box&); void append_box(Box&);
void append_text_chunk(TextNode&, size_t offset_in_node, size_t length_in_node, float width, float height); void append_text_chunk(TextNode&, size_t offset_in_node, size_t length_in_node, float width, float height);
void break_if_needed(LayoutMode, float next_item_width); void break_if_needed(LayoutMode, float next_item_width, bool should_force_break);
float available_width_for_current_line() const { return m_available_width_for_current_line; } float available_width_for_current_line() const { return m_available_width_for_current_line; }