mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-15 04:13:11 +00:00
LibWeb: Don't offset abspos children of flex container by padding twice
We were incorrectly offsetting the static position of abspos children of flex containers by the padding twice. This was a misguided attempt to adjust to the abspos containing block being the padding box, not the content box. Fixes #21344.
This commit is contained in:
parent
a86531809e
commit
3250a424f0
|
@ -0,0 +1,20 @@
|
||||||
|
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
|
||||||
|
BlockContainer <html> at (0,0) content-size 800x53.46875 [BFC] children: not-inline
|
||||||
|
BlockContainer <body> at (8,8) content-size 784x37.46875 children: not-inline
|
||||||
|
Box <div#flex-container> at (18,18) content-size 764x17.46875 flex-container(row) [FFC] children: not-inline
|
||||||
|
BlockContainer <div#absolute> at (18,18) content-size 50x50 positioned [BFC] children: not-inline
|
||||||
|
BlockContainer <div#orange> at (18,18) content-size 50x50 children: not-inline
|
||||||
|
BlockContainer <div#red> at (18,18) content-size 9.703125x17.46875 flex-item [BFC] children: inline
|
||||||
|
line 0 width: 9.703125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
|
||||||
|
frag 0 from TextNode start: 0, length: 1, rect: [18,18 9.703125x17.46875]
|
||||||
|
"x"
|
||||||
|
TextNode <#text>
|
||||||
|
|
||||||
|
ViewportPaintable (Viewport<#document>) [0,0 800x600]
|
||||||
|
PaintableWithLines (BlockContainer<HTML>) [0,0 800x53.46875] overflow: [0,0 800x68]
|
||||||
|
PaintableWithLines (BlockContainer<BODY>) [8,8 784x37.46875] overflow: [8,8 784x60]
|
||||||
|
PaintableBox (Box<DIV>#flex-container) [8,8 784x37.46875] overflow: [8,8 784x60]
|
||||||
|
PaintableWithLines (BlockContainer<DIV>#absolute) [18,18 50x50]
|
||||||
|
PaintableWithLines (BlockContainer<DIV>#orange) [18,18 50x50]
|
||||||
|
PaintableWithLines (BlockContainer<DIV>#red) [18,18 9.703125x17.46875]
|
||||||
|
TextPaintable (TextNode<#text>)
|
|
@ -0,0 +1,17 @@
|
||||||
|
<!DOCTYPE html><html><head><style>
|
||||||
|
#flex-container {
|
||||||
|
display: flex;
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
#absolute {
|
||||||
|
position: absolute;
|
||||||
|
}
|
||||||
|
#orange {
|
||||||
|
background-color: orange;
|
||||||
|
width: 50px;
|
||||||
|
height: 50px;
|
||||||
|
}
|
||||||
|
#red {
|
||||||
|
background-color: red;
|
||||||
|
}
|
||||||
|
</style></head><body><div id="flex-container"><div id="absolute"><div id="orange"></div></div><div id="red">x
|
|
@ -2240,14 +2240,6 @@ CSSPixelPoint FlexFormattingContext::calculate_static_position(Box const& box) c
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// NOTE: Next, we add the flex container's padding since abspos boxes are placed relative to the padding edge
|
|
||||||
// of their abspos containing block.
|
|
||||||
if (pack_from_end) {
|
|
||||||
main_offset += is_row_layout() ? m_flex_container_state.padding_right : m_flex_container_state.padding_bottom;
|
|
||||||
} else {
|
|
||||||
main_offset += is_row_layout() ? m_flex_container_state.padding_left : m_flex_container_state.padding_top;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pack_from_end)
|
if (pack_from_end)
|
||||||
main_offset += inner_main_size(flex_container()) - inner_main_size(box) - main_border_before - main_border_after;
|
main_offset += inner_main_size(flex_container()) - inner_main_size(box) - main_border_before - main_border_after;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue