mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Account for margin and padding of aligned abspos flex items

Browse source 
This patch also makes FlexFormattingContext::calculate_static_position
use computed values for margins and borders, since this function may be
called before the box's state has been finalized.
This commit is contained in:
implicitfield 2024-03-02 22:32:23 +04:00 • committed by Andreas Kling
parent e3b1d4a141
commit 3888a91c5b
4 changed files with 66 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Tests/LibWeb/Layout/expected/abspos-flex-margin-limits-1.txt Normal file
View file

@ -0,0 +1,16 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x16 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x0 children: inline
Box <div.container> at (8,8) content-size 100x100 positioned flex-container(row) [FFC] children: not-inline
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.bottom-left> at (18,48) content-size 50x50 positioned [BFC] children: not-inline
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x16]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
PaintableBox (Box<DIV>.container) [8,8 100x100]
PaintableWithLines (BlockContainer<DIV>.bottom-left) [8,38 70x70]

24
Tests/LibWeb/Layout/expected/flex/abspos-flex-child-static-position-with-align-items.txt
View file

@ -32,15 +32,15 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
Box <div.outer.end> at (38,208) content-size 150x150 flex-container(row) flex-item [FFC] children: not-inline
BlockContainer <div> at (48,308) content-size 150x50 positioned [BFC] children: inline
frag 0 from TextNode start: 0, length: 3, rect: [48,308 26.1875x17] baseline: 13.296875
BlockContainer <div> at (48,298) content-size 150x50 positioned [BFC] children: inline
frag 0 from TextNode start: 0, length: 3, rect: [48,298 26.1875x17] baseline: 13.296875
"end"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
Box <div.outer.flex-end> at (208,208) content-size 150x150 flex-container(row) flex-item [FFC] children: not-inline
BlockContainer <div> at (218,308) content-size 150x50 positioned [BFC] children: inline
frag 0 from TextNode start: 0, length: 8, rect: [218,308 61.765625x17] baseline: 13.296875
BlockContainer <div> at (218,298) content-size 150x50 positioned [BFC] children: inline
frag 0 from TextNode start: 0, length: 8, rect: [218,298 61.765625x17] baseline: 13.296875
"flex-end"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
@ -60,8 +60,8 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
Box <div.outer.self-end> at (38,378) content-size 150x150 flex-container(row) flex-item [FFC] children: not-inline
BlockContainer <div> at (48,478) content-size 150x50 positioned [BFC] children: inline
frag 0 from TextNode start: 0, length: 8, rect: [48,478 61.40625x17] baseline: 13.296875
BlockContainer <div> at (48,468) content-size 150x50 positioned [BFC] children: inline
frag 0 from TextNode start: 0, length: 8, rect: [48,468 61.40625x17] baseline: 13.296875
"self-end"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
@ -82,11 +82,11 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableBox (Box<DIV>.outer.flex-start) [538,28 170x170] overflow: [548,38 170x150]
PaintableWithLines (BlockContainer<DIV>) [548,38 170x70]
TextPaintable (TextNode<#text>)
PaintableBox (Box<DIV>.outer.end) [28,198 170x170] overflow: [38,208 170x160]
PaintableWithLines (BlockContainer<DIV>) [38,298 170x70]
PaintableBox (Box<DIV>.outer.end) [28,198 170x170] overflow: [38,208 170x150]
PaintableWithLines (BlockContainer<DIV>) [38,288 170x70]
TextPaintable (TextNode<#text>)
PaintableBox (Box<DIV>.outer.flex-end) [198,198 170x170] overflow: [208,208 170x160]
PaintableWithLines (BlockContainer<DIV>) [208,298 170x70]
PaintableBox (Box<DIV>.outer.flex-end) [198,198 170x170] overflow: [208,208 170x150]
PaintableWithLines (BlockContainer<DIV>) [208,288 170x70]
TextPaintable (TextNode<#text>)
PaintableBox (Box<DIV>.outer.center) [368,198 170x170] overflow: [378,208 170x150]
PaintableWithLines (BlockContainer<DIV>) [378,248 170x70]
@ -94,6 +94,6 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableBox (Box<DIV>.outer.self-start) [538,198 170x170] overflow: [548,208 170x150]
PaintableWithLines (BlockContainer<DIV>) [548,208 170x70]
TextPaintable (TextNode<#text>)
PaintableBox (Box<DIV>.outer.self-end) [28,368 170x170] overflow: [38,378 170x160]
PaintableWithLines (BlockContainer<DIV>) [38,468 170x70]
PaintableBox (Box<DIV>.outer.self-end) [28,368 170x170] overflow: [38,378 170x150]
PaintableWithLines (BlockContainer<DIV>) [38,458 170x70]
TextPaintable (TextNode<#text>)

23
Tests/LibWeb/Layout/input/abspos-flex-margin-limits-1.html Normal file
View file

@ -0,0 +1,23 @@
<!DOCTYPE html>
<style>
.container {
position: absolute;
width: 100px;
height: 100px;
background: red;
display: flex;
align-items: end;
}
.bottom-left {
position: absolute;
width: 50px;
height: 50px;
margin-top: 500px;
background: green;
border: 5px solid black;
padding: 5px;
}
</style>
<div class="container">
<div class="bottom-left"></div>
</div>

25
Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp
View file

@ -2106,14 +2106,19 @@ CSSPixelPoint FlexFormattingContext::calculate_static_position(Box const& box) c
CSSPixels cross_offset = 0;
CSSPixels half_line_size = inner_cross_size(m_flex_container_state) / 2;
auto cross_to_px = [&](CSS::LengthPercentage const& length_percentage) -> CSSPixels {
return length_percentage.to_px(box, m_flex_container_state.content_width());
};
auto const& box_state = m_state.get(box);
CSSPixels cross_margin_before = is_row_layout() ? box_state.margin_top : box_state.margin_left;
CSSPixels cross_margin_after = is_row_layout() ? box_state.margin_bottom : box_state.margin_right;
CSSPixels cross_border_before = is_row_layout() ? box_state.border_top : box_state.border_left;
CSSPixels cross_border_after = is_row_layout() ? box_state.border_bottom : box_state.border_right;
CSSPixels cross_padding_after = is_row_layout() ? box_state.padding_bottom : box_state.padding_right;
CSSPixels main_border_before = is_row_layout() ? box_state.border_left : box_state.border_top;
CSSPixels main_border_after = is_row_layout() ? box_state.border_right : box_state.border_bottom;
CSSPixels cross_margin_before = is_row_layout() ? cross_to_px(box.computed_values().margin().top()) : cross_to_px(box.computed_values().margin().left());
CSSPixels cross_margin_after = is_row_layout() ? cross_to_px(box.computed_values().margin().bottom()) : cross_to_px(box.computed_values().margin().right());
CSSPixels cross_border_before = is_row_layout() ? box.computed_values().border_top().width : box.computed_values().border_left().width;
CSSPixels cross_border_after = is_row_layout() ? box.computed_values().border_bottom().width : box.computed_values().border_right().width;
CSSPixels cross_padding_before = is_row_layout() ? cross_to_px(box.computed_values().padding().top()) : cross_to_px(box.computed_values().padding().left());
CSSPixels cross_padding_after = is_row_layout() ? cross_to_px(box.computed_values().padding().bottom()) : cross_to_px(box.computed_values().padding().right());
CSSPixels main_border_before = is_row_layout() ? box.computed_values().border_left().width : box.computed_values().border_top().width;
CSSPixels main_border_after = is_row_layout() ? box.computed_values().border_right().width : box.computed_values().border_bottom().width;
switch (alignment_for_item(box)) {
case CSS::AlignItems::Baseline:
@ -2124,15 +2129,15 @@ CSSPixelPoint FlexFormattingContext::calculate_static_position(Box const& box) c
case CSS::AlignItems::SelfStart:
case CSS::AlignItems::Stretch:
case CSS::AlignItems::Normal:
cross_offset = -half_line_size + cross_margin_before;
cross_offset = -half_line_size;
break;
case CSS::AlignItems::End:
case CSS::AlignItems::SelfEnd:
case CSS::AlignItems::FlexEnd:
cross_offset = half_line_size - inner_cross_size(box_state) - cross_margin_after - cross_border_after - cross_padding_after;
cross_offset = half_line_size - inner_cross_size(box_state) - (cross_margin_before + cross_margin_after) - (cross_border_before + cross_border_after) - (cross_padding_before + cross_padding_after);
break;
case CSS::AlignItems::Center:
cross_offset = -((inner_cross_size(box_state) + cross_border_before + cross_border_after) / 2);
cross_offset = -((inner_cross_size(box_state) + cross_margin_after + cross_margin_before + cross_border_before + cross_border_after + cross_padding_before + cross_padding_after) / 2);
break;
default:
break;