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

auto merge of #1255 : recrack/servo/fix_compute_height, r=metajack

Browse source 
Thanks @metajack
This commit is contained in:
bors-servo 2013-11-14 06:55:31 -08:00
commit 38b17026de
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -212,9 +212,10 @@ impl BlockFlow {
for &box in self.box.iter() { for &box in self.box.iter() {
let base = box.base(); let base = box.base();
let style = base.style(); let style = base.style();
let maybe_height = MaybeAuto::from_style(style.Box.height, Au::new(0)); height = match MaybeAuto::from_style(style.Box.height, Au::new(0)) {
let maybe_height = maybe_height.specified_or_zero(); Auto => height,
height = geometry::max(height, maybe_height); Specified(value) => value
};
} }
let mut noncontent_height = Au::new(0); let mut noncontent_height = Au::new(0);
@ -238,7 +239,6 @@ impl BlockFlow {
model.margin.bottom; model.margin.bottom;
} }
//TODO(eatkinson): compute heights using the 'height' property.
self.base.position.size.height = height + noncontent_height; self.base.position.size.height = height + noncontent_height;
if inorder { if inorder {