diff --git a/Tests/LibWeb/Layout/expected/grid/item-fit-content-width.txt b/Tests/LibWeb/Layout/expected/grid/item-fit-content-width.txt new file mode 100644 index 0000000000..1ade2d4df0 --- /dev/null +++ b/Tests/LibWeb/Layout/expected/grid/item-fit-content-width.txt @@ -0,0 +1,25 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (0,0) content-size 800x33.46875 [BFC] children: not-inline + BlockContainer at (8,8) content-size 784x17.46875 children: not-inline + Box at (8,8) content-size 784x17.46875 flex-container(row) [FFC] children: not-inline + Box at (8,8) content-size 67.4375x17.46875 flex-item [GFC] children: not-inline + BlockContainer at (8,8) content-size 31.25x17.46875 [BFC] children: inline + line 0 width: 31.25, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 4, rect: [8,8 31.25x17.46875] + "Col1" + TextNode <#text> + BlockContainer at (41.71875,8) content-size 33.71875x17.46875 [BFC] children: inline + line 0 width: 33.71875, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 4, rect: [41.71875,8 33.71875x17.46875] + "Col2" + TextNode <#text> + +ViewportPaintable (Viewport<#document>) [0,0 800x600] + PaintableWithLines (BlockContainer) [0,0 800x33.46875] + PaintableWithLines (BlockContainer) [8,8 784x17.46875] + PaintableBox (Box
.flex) [8,8 784x17.46875] + PaintableBox (Box
.grid) [8,8 67.4375x17.46875] + PaintableWithLines (BlockContainer
.w-fit) [8,8 31.25x17.46875] + TextPaintable (TextNode<#text>) + PaintableWithLines (BlockContainer
.w-fit) [41.71875,8 33.71875x17.46875] + TextPaintable (TextNode<#text>) diff --git a/Tests/LibWeb/Layout/input/grid/item-fit-content-width.html b/Tests/LibWeb/Layout/input/grid/item-fit-content-width.html new file mode 100644 index 0000000000..0adae921bd --- /dev/null +++ b/Tests/LibWeb/Layout/input/grid/item-fit-content-width.html @@ -0,0 +1,12 @@ +
Col1
Col2
\ No newline at end of file diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp index c6ccc8311d..0caace2811 100644 --- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp @@ -2196,11 +2196,12 @@ CSSPixels GridFormattingContext::calculate_max_content_contribution(GridItem con return should_treat_height_as_auto(item.box, available_space_for_item); }(); - if (should_treat_preferred_size_as_auto) { - return item.add_margin_box_sizes(calculate_max_content_size(item, dimension), dimension, m_state); + auto preferred_size = get_item_preferred_size(item, dimension); + if (should_treat_preferred_size_as_auto || preferred_size.is_fit_content()) { + auto fit_content_size = dimension == GridDimension::Column ? calculate_fit_content_width(item.box, available_space_for_item) : calculate_fit_content_height(item.box, available_space_for_item); + return item.add_margin_box_sizes(fit_content_size, dimension, m_state); } - auto preferred_size = get_item_preferred_size(item, dimension); auto containing_block_size = containing_block_size_for_item(item, dimension); return item.add_margin_box_sizes(preferred_size.to_px(grid_container(), containing_block_size), dimension, m_state); }