Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Vertical margins now contribute to content height.

Browse source
This commit is contained in:
Eric Atkinson 2013-06-04 12:33:35 -07:00 • committed by Patrick Walton
parent 4017839fe2
commit badf1b8573
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/main/layout/block.rs
View file

@ -265,20 +265,22 @@ impl BlockFlowData {
cur_y - top_offset cur_y - top_offset
}; };
let mut pb = Au(0); let mut noncontent_height = Au(0);
self.box.map(|&box| { self.box.map(|&box| {
do box.with_mut_base |base| { do box.with_mut_base |base| {
//The associated box is the border box of this flow //The associated box is the border box of this flow
base.position.origin.y = base.model.margin.top; base.position.origin.y = base.model.margin.top;
pb = base.model.padding.top + base.model.padding.bottom + noncontent_height = base.model.padding.top + base.model.padding.bottom +
base.model.border.top + base.model.border.bottom; base.model.border.top + base.model.border.bottom;
base.position.size.height = height + pb; base.position.size.height = height + noncontent_height;
noncontent_height += base.model.margin.top + base.model.margin.bottom;
} }
}); });
//TODO(eatkinson): compute heights using the 'height' property. //TODO(eatkinson): compute heights using the 'height' property.
self.common.position.size.height = height + pb; self.common.position.size.height = height + noncontent_height;
} }