0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-13 01:40:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibWeb: Return content box position from calculate_static_position

Browse source 
This change makes calculate_static_position to return content box
for both x and y (at least for the case when children are not inline).
It makes it possible to be consistent about x and y when calculating
box offset inside layout_absolutely_positioned_element.
This commit is contained in:
Aliaksandr Kalenik 2022-11-19 05:11:38 +03:00 committed by Andreas Kling
parent b45225dbac
commit 767cdf7b11
Notes: sideshowbarker 2024-07-18 00:41:35 +09:00 
Author: https://github.com/kalenikaliaksandr
Commit: https://github.com/SerenityOS/serenity/commit/767cdf7b11
Pull-request: https://github.com/SerenityOS/serenity/pull/16115
Reviewed-by: https://github.com/awesomekling
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibWeb/Layout/FormattingContext.cpp
View file

@ -916,6 +916,7 @@ Gfx::FloatPoint FormattingContext::calculate_static_position(Box const& box) con
// Easy case: no previous sibling, we're at the top of the containing block.
}
} else {
x = m_state.get(box).margin_box_left();
// We're among block siblings, Y can be calculated easily.
y = compute_box_y_position_with_respect_to_siblings(box);
}
@ -986,9 +987,8 @@ void FormattingContext::layout_absolutely_positioned_element(Box const& box, Ava
- box_state.border_box_right();
used_offset.set_x(width_of_containing_block + x_offset - box_state.content_width() - box_state.margin_right);
} else {
float x_offset = box_state.margin_box_left()
+ static_position.x();
used_offset.set_x(x_offset);
// NOTE: static position is content box position so border_box and margin should not be added
used_offset.set_x(static_position.x());
}
if (!computed_top.is_auto()) {
@ -1001,9 +1001,8 @@ void FormattingContext::layout_absolutely_positioned_element(Box const& box, Ava
- box_state.border_box_bottom();
used_offset.set_y(height_of_containing_block + y_offset - box_state.content_height() - box_state.margin_bottom);
} else {
float y_offset = box_state.margin_box_top()
+ static_position.y();
used_offset.set_y(y_offset);
// NOTE: static position is content box position so border_box and margin should not be added
used_offset.set_y(static_position.y());
}
// NOTE: Absolutely positioned boxes are relative to the *padding edge* of the containing block.