From 19afc5b11be26c48cf055a3a9ac738a55097bb4c Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Sat, 21 Sep 2024 19:31:27 +0200 Subject: [PATCH] LibWeb: Align to padding edge only auto positioned abspos grid items Containing block for abspos grid items depends on their grid placement: - if element has definite grid position, then corresponding grid area should be used as a containing block - if element does not have definite grid position, then padding edge of grid container should be used as a containing block So offset should be adjusted for paddings only for boxes without definite grid position. --- .../grid/abspos-item-with-padding.txt | 21 ++++++++++++ .../input/grid/abspos-item-with-padding.html | 32 +++++++++++++++++++ .../LibWeb/Layout/GridFormattingContext.cpp | 11 +++++-- 3 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 Tests/LibWeb/Layout/expected/grid/abspos-item-with-padding.txt create mode 100644 Tests/LibWeb/Layout/input/grid/abspos-item-with-padding.html diff --git a/Tests/LibWeb/Layout/expected/grid/abspos-item-with-padding.txt b/Tests/LibWeb/Layout/expected/grid/abspos-item-with-padding.txt new file mode 100644 index 00000000000..b0e560aabf8 --- /dev/null +++ b/Tests/LibWeb/Layout/expected/grid/abspos-item-with-padding.txt @@ -0,0 +1,21 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (1,1) content-size 798x220 [BFC] children: not-inline + BlockContainer at (10,10) content-size 780x202 children: not-inline + Box at (11,111) content-size 200x100 positioned [GFC] children: not-inline + BlockContainer at (12,112) content-size 50x50 positioned [BFC] children: inline + frag 0 from TextNode start: 0, length: 1, rect: [12,112 14.265625x17] baseline: 13.296875 + "A" + TextNode <#text> + BlockContainer at (12,12) content-size 50x50 positioned [BFC] children: inline + frag 0 from TextNode start: 0, length: 1, rect: [12,12 9.34375x17] baseline: 13.296875 + "B" + TextNode <#text> + +ViewportPaintable (Viewport<#document>) [0,0 800x600] + PaintableWithLines (BlockContainer) [0,0 800x222] + PaintableWithLines (BlockContainer) [9,9 782x204] + PaintableBox (Box
.grid) [10,10 202x202] + PaintableWithLines (BlockContainer
.abspos-item-with-grid-area) [11,111 52x52] + TextPaintable (TextNode<#text>) + PaintableWithLines (BlockContainer
.abspos-item-with-auto-placement) [11,11 52x52] + TextPaintable (TextNode<#text>) diff --git a/Tests/LibWeb/Layout/input/grid/abspos-item-with-padding.html b/Tests/LibWeb/Layout/input/grid/abspos-item-with-padding.html new file mode 100644 index 00000000000..10c55bb534a --- /dev/null +++ b/Tests/LibWeb/Layout/input/grid/abspos-item-with-padding.html @@ -0,0 +1,32 @@ +
A
B
\ No newline at end of file diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp index 2f30f4be11a..94a97b2243f 100644 --- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp @@ -1899,10 +1899,11 @@ void GridFormattingContext::run(AvailableSpace const& available_space) void GridFormattingContext::layout_absolutely_positioned_element(Box const& box) { - auto& containing_block_state = m_state.get_mutable(*box.containing_block()); auto& box_state = m_state.get_mutable(box); auto const& computed_values = box.computed_values(); + auto is_auto_positioned = is_auto_positioned_track(computed_values.grid_row_start(), computed_values.grid_row_end()) || is_auto_positioned_track(computed_values.grid_column_start(), computed_values.grid_column_end()); + auto row_placement_position = resolve_grid_position(box, GridDimension::Row); auto column_placement_position = resolve_grid_position(box, GridDimension::Column); @@ -2000,8 +2001,12 @@ void GridFormattingContext::layout_absolutely_positioned_element(Box const& box) used_offset.set_x(grid_area_rect.x() + box_state.inset_left + box_state.margin_box_left()); used_offset.set_y(grid_area_rect.y() + box_state.inset_top + box_state.margin_box_top()); - // NOTE: Absolutely positioned boxes are relative to the *padding edge* of the containing block. - used_offset.translate_by(-containing_block_state.padding_left, -containing_block_state.padding_top); + // NOTE: Absolutely positioned boxes with auto-placement are relative to the *padding edge* of the containing block. + if (is_auto_positioned) { + auto const& containing_block_state = m_state.get_mutable(*box.containing_block()); + used_offset.translate_by(-containing_block_state.padding_left, -containing_block_state.padding_top); + } + box_state.set_content_offset(used_offset); if (independent_formatting_context)