diff --git a/Tests/LibWeb/Layout/expected/grid/item-column-span-2.txt b/Tests/LibWeb/Layout/expected/grid/item-column-span-2.txt new file mode 100644 index 00000000000..182489a11c3 --- /dev/null +++ b/Tests/LibWeb/Layout/expected/grid/item-column-span-2.txt @@ -0,0 +1,21 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (0,0) content-size 800x600 [BFC] children: not-inline + BlockContainer at (8,8) content-size 784x35.40625 children: not-inline + Box at (8,8) content-size 784x35.40625 [GFC] children: not-inline + BlockContainer <(anonymous)> at (8,8) content-size 0x0 [BFC] children: inline + TextNode <#text> + BlockContainer at (8,8) content-size 100x35.40625 [BFC] children: not-inline + BlockContainer <(anonymous)> at (8,8) content-size 0x0 [BFC] children: inline + TextNode <#text> + BlockContainer at (108.000061,8) content-size 683.999938x35.40625 [BFC] children: inline + line 0 width: 625.953125, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 77, rect: [108.000061,8 625.953125x17.46875] + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut iaculis venenatis" + line 1 width: 304.0625, height: 17.9375, bottom: 35.40625, baseline: 13.53125 + frag 0 from TextNode start: 78, length: 39, rect: [108.000061,25 304.0625x17.46875] + "purus, eget blandit velit venenatis at." + TextNode <#text> + BlockContainer <(anonymous)> at (8,8) content-size 0x0 [BFC] children: inline + TextNode <#text> + BlockContainer <(anonymous)> at (8,43.40625) content-size 784x0 children: inline + TextNode <#text> diff --git a/Tests/LibWeb/Layout/input/grid/item-column-span-2.html b/Tests/LibWeb/Layout/input/grid/item-column-span-2.html new file mode 100644 index 00000000000..e7ffb7b7d0f --- /dev/null +++ b/Tests/LibWeb/Layout/input/grid/item-column-span-2.html @@ -0,0 +1,21 @@ + +
+
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut iaculis venenatis purus, eget blandit velit venenatis at.
+
diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp index 590d5cc2665..120e413fa73 100644 --- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp @@ -1649,11 +1649,37 @@ CSSPixels GridFormattingContext::containing_block_size_for_item(GridItem const& AvailableSpace GridFormattingContext::get_available_space_for_item(GridItem const& item) const { - auto const& column_track = m_grid_columns[item.raw_column()]; - AvailableSize available_width = column_track.has_definite_base_size ? AvailableSize::make_definite(column_track.base_size) : AvailableSize::make_indefinite(); + CSSPixels column_width = 0; + bool has_columns_with_definite_base_size = false; + for (size_t span = 0; span < item.raw_column_span(); span++) { + // FIXME: This check should not be need if grid item positioning works correct + if (item.raw_column() + span >= m_grid_columns.size()) + break; - auto const& row_track = m_grid_rows[item.raw_row()]; - AvailableSize available_height = row_track.has_definite_base_size ? AvailableSize::make_definite(row_track.base_size) : AvailableSize::make_indefinite(); + auto& track = m_grid_columns[item.raw_column() + span]; + column_width += track.base_size; + + if (track.has_definite_base_size) + has_columns_with_definite_base_size = true; + } + + AvailableSize available_width = has_columns_with_definite_base_size ? AvailableSize::make_definite(column_width) : AvailableSize::make_indefinite(); + + CSSPixels column_height = 0; + bool has_rows_with_definite_base_size = false; + for (size_t span = 0; span < item.raw_row_span(); span++) { + // FIXME: This check should not be need if grid item positioning works correct + if (item.raw_row() + span >= m_grid_rows.size()) + break; + + auto& track = m_grid_rows[item.raw_row() + span]; + column_height += track.base_size; + + if (track.has_definite_base_size) + has_rows_with_definite_base_size = true; + } + + AvailableSize available_height = has_rows_with_definite_base_size ? AvailableSize::make_definite(column_height) : AvailableSize::make_indefinite(); return AvailableSpace(available_width, available_height); }