From 802b58d7e133a955da1acc80eb590e0618ca620d Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Mon, 23 Oct 2023 17:54:37 +0200 Subject: [PATCH] LibWeb: Resolve grid item's min-width and max-width in GFC Now min-width and max-width properties affect resulting width of grid item instead of being ignored. --- .../Layout/expected/grid/item-max-width.txt | 11 +++++++++++ .../Layout/expected/grid/item-min-width.txt | 11 +++++++++++ .../LibWeb/Layout/input/grid/item-max-width.html | 11 +++++++++++ .../LibWeb/Layout/input/grid/item-min-width.html | 11 +++++++++++ .../LibWeb/Layout/GridFormattingContext.cpp | 15 +++++++++++++++ 5 files changed, 59 insertions(+) create mode 100644 Tests/LibWeb/Layout/expected/grid/item-max-width.txt create mode 100644 Tests/LibWeb/Layout/expected/grid/item-min-width.txt create mode 100644 Tests/LibWeb/Layout/input/grid/item-max-width.html create mode 100644 Tests/LibWeb/Layout/input/grid/item-min-width.html diff --git a/Tests/LibWeb/Layout/expected/grid/item-max-width.txt b/Tests/LibWeb/Layout/expected/grid/item-max-width.txt new file mode 100644 index 0000000000..e3dc578b9b --- /dev/null +++ b/Tests/LibWeb/Layout/expected/grid/item-max-width.txt @@ -0,0 +1,11 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (0,0) content-size 800x116 [BFC] children: not-inline + BlockContainer at (8,8) content-size 784x100 children: not-inline + Box at (8,8) content-size 784x100 [GFC] children: not-inline + BlockContainer at (8,8) content-size 392x100 [BFC] children: not-inline + +ViewportPaintable (Viewport<#document>) [0,0 800x600] + PaintableWithLines (BlockContainer) [0,0 800x116] + PaintableWithLines (BlockContainer) [8,8 784x100] + PaintableBox (Box
.app-privacy__cards) [8,8 784x100] + PaintableWithLines (BlockContainer
.app-privacy__card) [8,8 392x100] diff --git a/Tests/LibWeb/Layout/expected/grid/item-min-width.txt b/Tests/LibWeb/Layout/expected/grid/item-min-width.txt new file mode 100644 index 0000000000..e3dc578b9b --- /dev/null +++ b/Tests/LibWeb/Layout/expected/grid/item-min-width.txt @@ -0,0 +1,11 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (0,0) content-size 800x116 [BFC] children: not-inline + BlockContainer at (8,8) content-size 784x100 children: not-inline + Box at (8,8) content-size 784x100 [GFC] children: not-inline + BlockContainer at (8,8) content-size 392x100 [BFC] children: not-inline + +ViewportPaintable (Viewport<#document>) [0,0 800x600] + PaintableWithLines (BlockContainer) [0,0 800x116] + PaintableWithLines (BlockContainer) [8,8 784x100] + PaintableBox (Box
.app-privacy__cards) [8,8 784x100] + PaintableWithLines (BlockContainer
.app-privacy__card) [8,8 392x100] diff --git a/Tests/LibWeb/Layout/input/grid/item-max-width.html b/Tests/LibWeb/Layout/input/grid/item-max-width.html new file mode 100644 index 0000000000..3d091230f5 --- /dev/null +++ b/Tests/LibWeb/Layout/input/grid/item-max-width.html @@ -0,0 +1,11 @@ +
\ No newline at end of file diff --git a/Tests/LibWeb/Layout/input/grid/item-min-width.html b/Tests/LibWeb/Layout/input/grid/item-min-width.html new file mode 100644 index 0000000000..10fda21871 --- /dev/null +++ b/Tests/LibWeb/Layout/input/grid/item-min-width.html @@ -0,0 +1,11 @@ +
\ No newline at end of file diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp index bd8d940c49..cfaf032ae2 100644 --- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp @@ -1626,6 +1626,21 @@ void GridFormattingContext::resolve_grid_item_widths() } else { used_width = try_compute_width(computed_width.to_px(grid_container(), containing_block_width)); } + + if (!should_treat_max_width_as_none(item.box, m_available_space->width)) { + auto max_width = try_compute_width(computed_values.max_width().to_px(grid_container(), containing_block_width)); + if (used_width > max_width) { + used_width = max_width; + } + } + + if (!computed_values.min_width().is_auto()) { + auto min_width = try_compute_width(computed_values.min_width().to_px(grid_container(), containing_block_width)); + if (used_width < min_width) { + used_width = min_width; + } + } + box_state.set_content_width(used_width); } }