diff --git a/Tests/LibWeb/Layout/expected/grid/grid-container-min-height-border-box.txt b/Tests/LibWeb/Layout/expected/grid/grid-container-min-height-border-box.txt new file mode 100644 index 00000000000..8ded29526f1 --- /dev/null +++ b/Tests/LibWeb/Layout/expected/grid/grid-container-min-height-border-box.txt @@ -0,0 +1,9 @@ +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 784x300 children: not-inline + Box at (8,208) content-size 784x100 [GFC] children: not-inline + +ViewportPaintable (Viewport<#document>) [0,0 800x600] + PaintableWithLines (BlockContainer) [0,0 800x600] + PaintableWithLines (BlockContainer) [8,8 784x300] + PaintableBox (Box
.box) [8,8 784x300] diff --git a/Tests/LibWeb/Layout/input/grid/grid-container-min-height-border-box.html b/Tests/LibWeb/Layout/input/grid/grid-container-min-height-border-box.html new file mode 100644 index 00000000000..9676047a783 --- /dev/null +++ b/Tests/LibWeb/Layout/input/grid/grid-container-min-height-border-box.html @@ -0,0 +1,9 @@ +
\ No newline at end of file diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp index d0b4b46f961..17b573655b7 100644 --- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp @@ -1924,7 +1924,8 @@ void GridFormattingContext::run(Box const&, LayoutMode, AvailableSpace const& av auto const& containing_block_state = m_state.get(*grid_container().containing_block()); auto height_of_containing_block = containing_block_state.content_height(); - auto min_height = grid_container().computed_values().min_height().to_px(grid_container(), height_of_containing_block); + auto height_of_container_block_as_available_size = AvailableSize::make_definite(height_of_containing_block); + auto min_height = calculate_inner_height(grid_container(), height_of_container_block_as_available_size, grid_computed_values.min_height()).to_px(grid_container()); // If automatic grid container height is less than min-height, we need to re-run the track sizing algorithm if (m_automatic_content_height < min_height) {