From af004ff0ef162a1752db2a1be0b939da4c24f3b1 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 28 May 2023 18:24:55 +0200 Subject: [PATCH] LibWeb: Support `min-content` for `width`, `min-width` and `max-width` We're gonna need to handle this in many more places, this patch only adds it to calculate_inner_width(). --- .../block-with-min-content-width.txt | 33 +++++++++++++++++++ .../block-with-min-content-width.html | 22 +++++++++++++ Userland/Libraries/LibWeb/CSS/Properties.json | 5 ++- .../LibWeb/Layout/FormattingContext.cpp | 3 ++ 4 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 Tests/LibWeb/Layout/expected/block-and-inline/block-with-min-content-width.txt create mode 100644 Tests/LibWeb/Layout/input/block-and-inline/block-with-min-content-width.html diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-min-content-width.txt b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-min-content-width.txt new file mode 100644 index 00000000000..75239db0d9f --- /dev/null +++ b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-min-content-width.txt @@ -0,0 +1,33 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (1,1) content-size 798x130.21875 [BFC] children: not-inline + BlockContainer at (10,10) content-size 780x112.21875 children: not-inline + BlockContainer at (11,11) content-size 93.765625x35.40625 children: inline + line 0 width: 43.578125, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 6, rect: [11,11 43.578125x17.46875] + "width:" + line 1 width: 93.765625, height: 17.9375, bottom: 35.40625, baseline: 13.53125 + frag 0 from TextNode start: 7, length: 11, rect: [11,28 93.765625x17.46875] + "min-content" + TextNode <#text> + BlockContainer <(anonymous)> at (10,47.40625) content-size 780x0 children: inline + TextNode <#text> + BlockContainer at (11,48.40625) content-size 93.765625x35.40625 children: inline + line 0 width: 81.3125, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 10, rect: [11,48.40625 81.3125x17.46875] + "max-width:" + line 1 width: 93.765625, height: 17.9375, bottom: 35.40625, baseline: 13.53125 + frag 0 from TextNode start: 11, length: 11, rect: [11,65.40625 93.765625x17.46875] + "min-content" + TextNode <#text> + BlockContainer <(anonymous)> at (10,84.8125) content-size 780x0 children: inline + TextNode <#text> + BlockContainer at (11,85.8125) content-size 93.765625x35.40625 children: inline + line 0 width: 76.4375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 10, rect: [11,85.8125 76.4375x17.46875] + "min-width:" + line 1 width: 93.765625, height: 17.9375, bottom: 35.40625, baseline: 13.53125 + frag 0 from TextNode start: 11, length: 11, rect: [11,102.8125 93.765625x17.46875] + "min-content" + TextNode <#text> + BlockContainer <(anonymous)> at (10,122.21875) content-size 780x0 children: inline + TextNode <#text> diff --git a/Tests/LibWeb/Layout/input/block-and-inline/block-with-min-content-width.html b/Tests/LibWeb/Layout/input/block-and-inline/block-with-min-content-width.html new file mode 100644 index 00000000000..adf4b55119e --- /dev/null +++ b/Tests/LibWeb/Layout/input/block-and-inline/block-with-min-content-width.html @@ -0,0 +1,22 @@ + +
width: min-content
+
max-width: min-content
+
min-width: min-content
diff --git a/Userland/Libraries/LibWeb/CSS/Properties.json b/Userland/Libraries/LibWeb/CSS/Properties.json index cfff90b15ca..202e23c3cf1 100644 --- a/Userland/Libraries/LibWeb/CSS/Properties.json +++ b/Userland/Libraries/LibWeb/CSS/Properties.json @@ -1339,6 +1339,7 @@ "valid-identifiers": [ "fit-content", "max-content", + "min-content", "none" ], "quirks": [ @@ -1376,6 +1377,7 @@ "auto", "fit-content", "max-content", + "min-content", "none" ], "quirks": [ @@ -1776,7 +1778,8 @@ "valid-identifiers": [ "auto", "fit-content", - "max-content" + "max-content", + "min-content" ], "quirks": [ "unitless-length" diff --git a/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp index 18b02f18f2b..90c6cf171a6 100644 --- a/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp @@ -1352,6 +1352,9 @@ CSS::Length FormattingContext::calculate_inner_width(Layout::Box const& box, Ava if (width.is_max_content()) { return CSS::Length::make_px(calculate_max_content_width(box)); } + if (width.is_min_content()) { + return CSS::Length::make_px(calculate_min_content_width(box)); + } auto& computed_values = box.computed_values(); if (computed_values.box_sizing() == CSS::BoxSizing::BorderBox) {