LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-19 09:17:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Resolve block max-width percentage against containing block

Browse Source
This commit is contained in:
FalseHonesty 2023-10-28 20:53:17 -04:00 committed by Alexander Kalenik
parent 8df3e6b203
commit 2285dfb80e
Notes: sideshowbarker 2024-07-17 08:55:54 +09:00 
Author: https://github.com/FalseHonesty
Commit: https://github.com/SerenityOS/serenity/commit/2285dfb80e
Pull-request: https://github.com/SerenityOS/serenity/pull/21664
Reviewed-by: https://github.com/kalenikaliaksandr ✅
5 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tests/LibWeb/Layout/expected/block-and-inline/max-width-percentage-containing-block.txt Normal file
View File

@ -0,0 +1,14 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (1,1) content-size 798x37.46875 [BFC] children: not-inline
BlockContainer <body> at (10,10) content-size 780x19.46875 children: not-inline
BlockContainer <span.text> at (11,11) content-size 66.671875x17.46875 children: inline
line 0 width: 66.671875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 7, rect: [11,11 66.671875x17.46875]
"Trimmed"
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x39.46875]
PaintableWithLines (BlockContainer<BODY>) [9,9 782x21.46875]
PaintableWithLines (BlockContainer<SPAN>.text) [10,10 68.671875x19.46875]
TextPaintable (TextNode<#text>)

16
Tests/LibWeb/Layout/expected/grid/min-max-content.txt
View File

@ -4,23 +4,23 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
Box <div.grid-container> at (8,8) content-size 784x17.46875 [GFC] children: not-inline
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (8,8) content-size 46.890625x17.46875 [BFC] children: inline
BlockContainer <div.grid-item> at (8,8) content-size 196x17.46875 [BFC] children: inline
line 0 width: 93.765625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 11, rect: [8,8 93.765625x17.46875]
"min-content"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (54.890625,8) content-size 98.640625x17.46875 [BFC] children: inline
BlockContainer <div.grid-item> at (204,8) content-size 98.640625x17.46875 [BFC] children: inline
line 0 width: 98.640625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 11, rect: [54.890625,8 98.640625x17.46875]
frag 0 from TextNode start: 0, length: 11, rect: [204,8 98.640625x17.46875]
"max-content"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (153.53125,8) content-size 638.46875x17.46875 [BFC] children: inline
BlockContainer <div.grid-item> at (302.640625,8) content-size 489.359375x17.46875 [BFC] children: inline
line 0 width: 21.609375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 3, rect: [153.53125,8 21.609375x17.46875]
frag 0 from TextNode start: 0, length: 3, rect: [302.640625,8 21.609375x17.46875]
"1fr"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
@ -30,9 +30,9 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
PaintableBox (Box<DIV>.grid-container) [8,8 784x17.46875]
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,8 46.890625x17.46875] overflow: [8,8 93.765625x17.46875]
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,8 196x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.grid-item) [54.890625,8 98.640625x17.46875]
PaintableWithLines (BlockContainer<DIV>.grid-item) [204,8 98.640625x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.grid-item) [153.53125,8 638.46875x17.46875]
PaintableWithLines (BlockContainer<DIV>.grid-item) [302.640625,8 489.359375x17.46875]
TextPaintable (TextNode<#text>)

11
Tests/LibWeb/Layout/input/block-and-inline/max-width-percentage-containing-block.html Normal file
View File

@ -0,0 +1,11 @@
<!DOCTYPE html><style>
* {
border: 1px solid black;
}
.text {
width: min-content;
max-width: 50%;
display: block;
}
</style><body><span class="text">Trimmed

15
Tests/LibWeb/Layout/input/grid/item-min-max-percentage-width.html
View File

@ -1,15 +0,0 @@
<style>
* {
border: 1px solid black;
}
.grid-container {
display: grid;
grid-template-columns: min-content;
}
.grid-item {
min-width: 25%;
max-width: 50%;
}
</style><div class="grid-container"><div class="grid-item">mincontent</div></div>

5
Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp
View File

@ -519,7 +519,10 @@ void BlockFormattingContext::layout_inline_children(BlockContainer const& block_
// NOTE: min-width or max-width for boxes with inline children can only be applied after inside layout
// is done and width of box content is known
auto used_width_px = context.automatic_content_width();
auto available_width = AvailableSize::make_definite(used_width_px);
// https://www.w3.org/TR/css-sizing-3/#sizing-values
// Percentages are resolved against the width/height, as appropriate, of the box’s containing block.
auto containing_block_width = m_state.get(*block_container.containing_block()).content_width();
auto available_width = AvailableSize::make_definite(containing_block_width);
if (!should_treat_max_width_as_none(block_container, available_space.width)) {
auto max_width_px = calculate_inner_width(block_container, available_width, block_container.computed_values().max_width()).to_px(block_container);
if (used_width_px > max_width_px)