mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 15:07:45 +00:00
LibWeb: Support inline-level padding and border properly
Here's roughly how this works: - InlineLevelIterator keeps a nesting stack of inline-level nodes with box model metrics. - When entering a node with box model metrics, we add them to the current "leading metrics". - When exiting a node with box model metrics, we add them to the current "trailing metrics". - Pending leading metrics are consumed by the first fragment added to the line. - Pending trailing metrics are consumed by the last fragment added to the line. Like before, the position of a line box fragment is the top left of its content box. However, fragments are placed horizontally along the line with space inserted for padding and border. InlineNode::paint() now expands the content rect as appropriate when painting background and borders. Note that margins and margin collapsing is not yet implemented. This makes the eyes on ACID2 horizontally centered. :^)
This commit is contained in:
parent
7d2a49eeb8
commit
f2a917229a
8 changed files with 191 additions and 36 deletions
|
@ -166,7 +166,7 @@ void InlineFormattingContext::generate_line_boxes(LayoutMode layout_mode)
|
|||
{
|
||||
containing_block().line_boxes().clear();
|
||||
|
||||
InlineLevelIterator iterator(containing_block(), layout_mode);
|
||||
InlineLevelIterator iterator(*this, containing_block(), layout_mode);
|
||||
LineBuilder line_builder(*this);
|
||||
|
||||
for (;;) {
|
||||
|
@ -185,18 +185,19 @@ void InlineFormattingContext::generate_line_boxes(LayoutMode layout_mode)
|
|||
break;
|
||||
case InlineLevelIterator::Item::Type::Element: {
|
||||
auto& box = verify_cast<Layout::Box>(*item.node);
|
||||
dimension_box_on_line(box, layout_mode);
|
||||
line_builder.break_if_needed(layout_mode, box.content_width(), item.should_force_break);
|
||||
line_builder.append_box(box);
|
||||
line_builder.break_if_needed(layout_mode, item.border_box_width(), item.should_force_break);
|
||||
line_builder.append_box(box, item.border_start + item.padding_start, item.padding_end + item.border_end);
|
||||
break;
|
||||
}
|
||||
case InlineLevelIterator::Item::Type::Text: {
|
||||
auto& text_node = verify_cast<Layout::TextNode>(*item.node);
|
||||
line_builder.break_if_needed(layout_mode, item.width, item.should_force_break);
|
||||
line_builder.break_if_needed(layout_mode, item.border_box_width(), item.should_force_break);
|
||||
line_builder.append_text_chunk(
|
||||
text_node,
|
||||
item.offset_in_node,
|
||||
item.length_in_node,
|
||||
item.border_start + item.padding_start,
|
||||
item.padding_end + item.border_end,
|
||||
item.width,
|
||||
text_node.font().glyph_height());
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue