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

auto merge of #614 : metajack/servo/float-height-width, r=pcwalton

Browse source 
We were overshooting on height by including margins, and undershooting on
width by not including margins, borders, and padding.
This commit is contained in:
bors-servo 2013-07-22 17:12:19 -07:00
commit b94a5ab6d1
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/main/layout/float.rs
View file

@ -184,18 +184,24 @@ impl FloatFlowData {
}
let mut height = cur_y - top_offset;
let mut noncontent_width = Au(0);
let mut noncontent_height = Au(0);
let mut full_noncontent_width = Au(0);
let mut full_noncontent_height = Au(0);
self.box.map(|&box| {
do box.with_mut_base |base| {
//The associated box is the border box of this flow
base.position.origin.y = base.model.margin.top;
noncontent_width = base.model.padding.left + base.model.padding.right +
base.model.border.left + base.model.border.right;
noncontent_height = base.model.padding.top + base.model.padding.bottom +
base.model.border.top + base.model.border.bottom;
base.position.size.height = height + noncontent_height;
noncontent_height = noncontent_height + base.model.margin.top + base.model.margin.bottom;
full_noncontent_width = noncontent_width + base.model.margin.left + base.model.margin.right;
full_noncontent_height = noncontent_height + base.model.margin.top + base.model.margin.bottom;
}
});
@ -215,8 +221,8 @@ impl FloatFlowData {
}
let info = PlacementInfo {
width: self.common.position.size.width,
height: height,
width: self.common.position.size.width + full_noncontent_width,
height: height + full_noncontent_height,
ceiling: Au(0),
max_width: self.containing_width,
f_type: self.float_type,