RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

LibWeb: Respect justify-self property of grid items

Browse source
This commit is contained in:
Aliaksandr Kalenik 2023-07-14 14:49:51 +02:00 • committed by Andreas Kling
parent fedbb39e9e
commit e4e1208050
3 changed files with 70 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Tests/LibWeb/Layout/expected/grid/justify-self.txt Normal file
View file

@ -0,0 +1,26 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (1,1) content-size 798x76.40625 [BFC] children: not-inline
Box <body> at (10,10) content-size 780x58.40625 [GFC] children: not-inline
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div> at (11,11) content-size 43.859375x17.46875 [BFC] children: inline
line 0 width: 43.859375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 5, rect: [11,11 43.859375x17.46875]
"Start"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div> at (373.476562,30.46875) content-size 53.046875x17.46875 [BFC] children: inline
line 0 width: 53.046875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 6, rect: [373.476562,30.46875 53.046875x17.46875]
"Center"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div> at (759.671875,49.9375) content-size 29.328125x17.46875 [BFC] children: inline
line 0 width: 29.328125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 3, rect: [759.671875,49.9375 29.328125x17.46875]
"End"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>

15
Tests/LibWeb/Layout/input/grid/justify-self.html Normal file
View file

@ -0,0 +1,15 @@
<!DOCTYPE html>
<style>
* {
border: 1px solid black;
}
body {
display: grid;
grid-template-columns: 1fr;
}
</style>
<body>
<div style="justify-self: start">Start</div>
<div style="justify-self: center">Center</div>
<div style="justify-self: end">End</div>
</body>

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

@ -1426,17 +1426,39 @@ void GridFormattingContext::resolve_grid_item_widths()
auto try_compute_width = [&](CSSPixels a_width) { auto try_compute_width = [&](CSSPixels a_width) {
CSSPixels width = a_width; CSSPixels width = a_width;
auto underflow_px = containing_block_width - width - box_state.border_left - box_state.border_right - box_state.padding_left - box_state.padding_right - box_state.margin_left - box_state.margin_right;
// Auto margins absorb positive free space prior to alignment via the box alignment properties.
auto free_space_left_for_margins = containing_block_width - width - box_state.border_left - box_state.border_right - box_state.padding_left - box_state.padding_right - box_state.margin_left - box_state.margin_right;
if (computed_values.margin().left().is_auto() && computed_values.margin().right().is_auto()) { if (computed_values.margin().left().is_auto() && computed_values.margin().right().is_auto()) {
auto half_of_the_underflow = underflow_px / 2; box_state.margin_left = free_space_left_for_margins / 2;
box_state.margin_left = half_of_the_underflow; box_state.margin_right = free_space_left_for_margins / 2;
box_state.margin_right = half_of_the_underflow;
} else if (computed_values.margin().left().is_auto()) { } else if (computed_values.margin().left().is_auto()) {
box_state.margin_left = underflow_px; box_state.margin_left = free_space_left_for_margins;
} else if (computed_values.margin().right().is_auto()) { } else if (computed_values.margin().right().is_auto()) {
box_state.margin_right = underflow_px; box_state.margin_right = free_space_left_for_margins;
} else if (computed_values.width().is_auto()) { } else if (computed_values.width().is_auto()) {
width += underflow_px; width += free_space_left_for_margins;
}
auto free_space_left_for_alignment = containing_block_width - a_width - box_state.border_left - box_state.border_right - box_state.padding_left - box_state.padding_right - box_state.margin_left - box_state.margin_right;
switch (computed_values.justify_self()) {
case CSS::JustifySelf::Normal:
case CSS::JustifySelf::Stretch:
return width;
case CSS::JustifySelf::Center:
box_state.margin_left += free_space_left_for_alignment / 2;
box_state.margin_right += free_space_left_for_alignment / 2;
return a_width;
case CSS::JustifySelf::Start:
case CSS::JustifySelf::FlexStart:
box_state.margin_right += free_space_left_for_alignment;
return a_width;
case CSS::JustifySelf::End:
case CSS::JustifySelf::FlexEnd:
box_state.margin_left += free_space_left_for_alignment;
return a_width;
default:
break;
} }
return width; return width;