diff --git a/Tests/LibWeb/Layout/expected/grid/items-min-content-size-should-account-paddings.txt b/Tests/LibWeb/Layout/expected/grid/items-min-content-size-should-account-paddings.txt new file mode 100644 index 0000000000..b173a07ad5 --- /dev/null +++ b/Tests/LibWeb/Layout/expected/grid/items-min-content-size-should-account-paddings.txt @@ -0,0 +1,18 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (0,0) content-size 800x133.46875 [BFC] children: not-inline + BlockContainer at (8,8) content-size 784x117.46875 children: not-inline + Box at (8,8) content-size 784x117.46875 flex-container(row) [FFC] children: not-inline + Box at (8,8) content-size 470.4375x117.46875 flex-item [GFC] children: not-inline + BlockContainer at (58,58) content-size 135.21875x17.46875 [BFC] children: inline + line 0 width: 135.21875, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 16, rect: [58,58 135.21875x17.46875] + "Sign up for free" + TextNode <#text> + +ViewportPaintable (Viewport<#document>) [0,0 800x600] + PaintableWithLines (BlockContainer) [0,0 800x133.46875] + PaintableWithLines (BlockContainer) [8,8 784x117.46875] + PaintableBox (Box
.cta-banner) [8,8 784x117.46875] + PaintableBox (Box
.w-layout-grid) [8,8 470.4375x117.46875] + PaintableWithLines (BlockContainer
.button) [8,8 235.21875x117.46875] + TextPaintable (TextNode<#text>) diff --git a/Tests/LibWeb/Layout/input/grid/items-min-content-size-should-account-paddings.html b/Tests/LibWeb/Layout/input/grid/items-min-content-size-should-account-paddings.html new file mode 100644 index 0000000000..d4bac25a15 --- /dev/null +++ b/Tests/LibWeb/Layout/input/grid/items-min-content-size-should-account-paddings.html @@ -0,0 +1,16 @@ +
Sign up for free
\ No newline at end of file diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp index cfaf032ae2..c6ccc8311d 100644 --- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp @@ -1240,7 +1240,7 @@ void GridFormattingContext::expand_flexible_tracks(AvailableSpace const& availab }); if (crosses_flexible_track) - result = max(result, find_the_size_of_an_fr(spanned_tracks, calculate_max_content_size(item, dimension))); + result = max(result, find_the_size_of_an_fr(spanned_tracks, calculate_max_content_contribution(item, dimension))); } return result;