RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:27:44 +00:00
Code Issues Activity Actions

LibWeb: Use containing block width to measure fit-content width in GFC

Browse source 
When the grid layout gets to
`resolve_items_box_metrics(GridDimension::Column)`, we've already
determined the width of each column. However, the widths of the
individual grid items themselves haven't been set. Rather than using
`get_available_space_for_item()`, which returns an indefinite size if
an item's width/height hasn't been set, we should use the already
known track width as the available size to calculate the fit-content
width.
This commit is contained in:
Aliaksandr Kalenik 2023-08-27 02:05:58 +02:00 • committed by Andreas Kling
parent e1a9d7ec9d
commit d3d67857b2
3 changed files with 44 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Tests/LibWeb/Layout/expected/grid/place-items-center-nested-grids.txt Normal file
View file

@ -0,0 +1,28 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x104.21875 [BFC] children: not-inline
Box <body> at (8,8) content-size 784x88.21875 [GFC] children: not-inline
Box <div> at (8,8) content-size 784x88.21875 [GFC] children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 65.328125x88.21875 [BFC] children: inline
line 0 width: 50.5625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 6, rect: [8,8 50.5625x17.46875]
"Making"
line 1 width: 80.234375, height: 17.9375, bottom: 35.40625, baseline: 13.53125
frag 0 from TextNode start: 7, length: 8, rect: [8,25 80.234375x17.46875]
"Commerce"
line 2 width: 49.328125, height: 18.40625, bottom: 53.34375, baseline: 13.53125
frag 0 from TextNode start: 16, length: 6, rect: [8,42 49.328125x17.46875]
"Better"
line 3 width: 25.625, height: 17.875, bottom: 70.28125, baseline: 13.53125
frag 0 from TextNode start: 23, length: 3, rect: [8,60 25.625x17.46875]
"for"
line 4 width: 73.46875, height: 18.34375, bottom: 88.21875, baseline: 13.53125
frag 0 from TextNode start: 27, length: 8, rect: [8,77 73.46875x17.46875]
"Everyone"
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x104.21875]
PaintableBox (Box<BODY>) [8,8 784x88.21875]
PaintableBox (Box<DIV>) [8,8 784x88.21875]
PaintableWithLines (BlockContainer(anonymous)) [8,8 65.328125x88.21875] overflow: [8,8 80.234375x88.21875]
TextPaintable (TextNode<#text>)

13
Tests/LibWeb/Layout/input/grid/place-items-center-nested-grids.html Normal file
View file

@ -0,0 +1,13 @@
<!doctype html><style>
* {
outline: 1px solid black;
}
body {
display: grid;
place-items: center;
}
div {
display: grid;
grid-template-columns: repeat(12, minmax(0px, 1fr));
}
</style><body><div>Making Commerce Better for Everyone

5
Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
View file

@ -1636,10 +1636,11 @@ void GridFormattingContext::resolve_grid_item_widths()
}; };
CSSPixels used_width; CSSPixels used_width;
AvailableSpace available_space { AvailableSize::make_definite(containing_block_width), AvailableSize::make_indefinite() };
if (computed_width.is_auto()) { if (computed_width.is_auto()) {
used_width = try_compute_width(calculate_fit_content_width(item.box, get_available_space_for_item(item))); used_width = try_compute_width(calculate_fit_content_width(item.box, available_space));
} else if (computed_width.is_fit_content()) { } else if (computed_width.is_fit_content()) {
used_width = try_compute_width(calculate_fit_content_width(item.box, get_available_space_for_item(item))); used_width = try_compute_width(calculate_fit_content_width(item.box, available_space));
} else { } else {
used_width = try_compute_width(computed_width.to_px(grid_container(), containing_block_width)); used_width = try_compute_width(computed_width.to_px(grid_container(), containing_block_width));
} }