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-items property of grid container

Browse source
This commit is contained in:
Aliaksandr Kalenik 2023-07-14 20:57:36 +02:00 • committed by Andreas Kling
parent f060f89220
commit 2138c164c9
4 changed files with 82 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Tests/LibWeb/Layout/expected/grid/justify-items.txt Normal file
View file

@ -0,0 +1,27 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (1,1) content-size 798x82.40625 [BFC] children: not-inline
BlockContainer <body> at (10,10) content-size 780x64.40625 children: not-inline
BlockContainer <(anonymous)> at (10,10) content-size 780x0 children: inline
TextNode <#text>
Box <div.grid.start> at (11,11) content-size 778x19.46875 [GFC] children: not-inline
BlockContainer <div> at (12,12) 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: [12,12 43.859375x17.46875]
"Start"
TextNode <#text>
BlockContainer <(anonymous)> at (10,31.46875) content-size 780x0 children: inline
TextNode <#text>
Box <div.grid.center> at (11,32.46875) content-size 778x19.46875 [GFC] children: not-inline
BlockContainer <div> at (373.476562,33.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,33.46875 53.046875x17.46875]
"Center"
TextNode <#text>
BlockContainer <(anonymous)> at (10,52.9375) content-size 780x0 children: inline
TextNode <#text>
Box <div.grid.end> at (11,53.9375) content-size 778x19.46875 [GFC] children: not-inline
BlockContainer <div> at (758.671875,54.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: [758.671875,54.9375 29.328125x17.46875]
"End"
TextNode <#text>

11
Tests/LibWeb/Layout/input/grid/justify-items.html Normal file
View file

@ -0,0 +1,11 @@
<!DOCTYPE html><style>
* { border: 1px solid black; }
.grid { display: grid; }
.start { justify-items: start; }
.center { justify-items: center; }
.end { justify-items: end; }
</style>
<body>
<div class="grid start"><div>Start</div></div>
<div class="grid center"><div>Center</div></div>
<div class="grid end"><div>End</div></div>

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

@ -1414,6 +1414,40 @@ void GridFormattingContext::determine_grid_container_height()
m_automatic_content_height = total_y; m_automatic_content_height = total_y;
} }
CSS::JustifyItems GridFormattingContext::justification_for_item(Box const& box) const
{
switch (box.computed_values().justify_self()) {
case CSS::JustifySelf::Auto:
return grid_container().computed_values().justify_items();
case CSS::JustifySelf::End:
return CSS::JustifyItems::End;
case CSS::JustifySelf::Normal:
return CSS::JustifyItems::Normal;
case CSS::JustifySelf::SelfStart:
return CSS::JustifyItems::SelfStart;
case CSS::JustifySelf::SelfEnd:
return CSS::JustifyItems::SelfEnd;
case CSS::JustifySelf::FlexStart:
return CSS::JustifyItems::FlexStart;
case CSS::JustifySelf::FlexEnd:
return CSS::JustifyItems::FlexEnd;
case CSS::JustifySelf::Center:
return CSS::JustifyItems::Center;
case CSS::JustifySelf::Baseline:
return CSS::JustifyItems::Baseline;
case CSS::JustifySelf::Start:
return CSS::JustifyItems::Start;
case CSS::JustifySelf::Stretch:
return CSS::JustifyItems::Stretch;
case CSS::JustifySelf::Safe:
return CSS::JustifyItems::Safe;
case CSS::JustifySelf::Unsafe:
return CSS::JustifyItems::Unsafe;
default:
VERIFY_NOT_REACHED();
}
}
void GridFormattingContext::resolve_grid_item_widths() void GridFormattingContext::resolve_grid_item_widths()
{ {
for (auto& item : m_grid_items) { for (auto& item : m_grid_items) {
@ -1441,20 +1475,20 @@ void GridFormattingContext::resolve_grid_item_widths()
} }
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; 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()) { switch (justification_for_item(item.box)) {
case CSS::JustifySelf::Normal: case CSS::JustifyItems::Normal:
case CSS::JustifySelf::Stretch: case CSS::JustifyItems::Stretch:
return width; return width;
case CSS::JustifySelf::Center: case CSS::JustifyItems::Center:
box_state.margin_left += free_space_left_for_alignment / 2; box_state.margin_left += free_space_left_for_alignment / 2;
box_state.margin_right += free_space_left_for_alignment / 2; box_state.margin_right += free_space_left_for_alignment / 2;
return a_width; return a_width;
case CSS::JustifySelf::Start: case CSS::JustifyItems::Start:
case CSS::JustifySelf::FlexStart: case CSS::JustifyItems::FlexStart:
box_state.margin_right += free_space_left_for_alignment; box_state.margin_right += free_space_left_for_alignment;
return a_width; return a_width;
case CSS::JustifySelf::End: case CSS::JustifyItems::End:
case CSS::JustifySelf::FlexEnd: case CSS::JustifyItems::FlexEnd:
box_state.margin_left += free_space_left_for_alignment; box_state.margin_left += free_space_left_for_alignment;
return a_width; return a_width;
default: default:

2
Userland/Libraries/LibWeb/Layout/GridFormattingContext.h
View file

@ -103,6 +103,8 @@ public:
Box const& grid_container() const { return context_box(); } Box const& grid_container() const { return context_box(); }
private: private:
CSS::JustifyItems justification_for_item(Box const& box) const;
void resolve_items_box_metrics(GridDimension const dimension); void resolve_items_box_metrics(GridDimension const dimension);
CSSPixels m_automatic_content_height { 0 }; CSSPixels m_automatic_content_height { 0 };