RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 22:48:11 +00:00
Code Issues Activity Actions

LibWeb: Implement very basic margin collapsing

Browse source 
We now collapse a block's top margin with the previous sibling's
bottom margin so that the larger margin wins.
This commit is contained in:
Andreas Kling 2020-06-12 17:41:14 +02:00
parent 88673f3f85
commit 21b1f1653d
3 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Libraries/LibWeb/Layout/LayoutBlock.cpp
View file

@ -477,7 +477,14 @@ void LayoutBlock::compute_position()
if (relevant_sibling) {
auto& previous_sibling_style = relevant_sibling->box_model();
position_y += relevant_sibling->effective_offset().y() + relevant_sibling->height();
position_y += previous_sibling_style.margin_box(*this).bottom;
// Collapse top margin with bottom margin of previous sibling if necessary
float previous_sibling_margin_bottom = previous_sibling_style.margin().bottom.to_px(*relevant_sibling);
float my_margin_top = box_model().margin().top.to_px(*this);
if (previous_sibling_margin_bottom > my_margin_top) {
// Sibling's margin is larger than mine, adjust so we use sibling's.
position_y += previous_sibling_margin_bottom - my_margin_top;
}
}
set_offset({ position_x, position_y });