Skip to content
Permalink
Browse files

Fix doubling noncontent_height in float flow

  • Loading branch information...
ILyoan committed Aug 19, 2013
1 parent c1d6137 commit a422d548b9dd9b79b7dc6e71dad7d5f9663e5834
Showing with 3 additions and 5 deletions.
  1. +3 −5 src/components/main/layout/float.rs
@@ -185,7 +185,7 @@ impl FloatFlowData {
let mut height = Au(0);
let mut clearance = Au(0);
let mut full_noncontent_width = Au(0);
let mut full_noncontent_height = Au(0);
let mut margin_height = Au(0);

self.box.map(|&box| {
height = do box.with_base |base| {
@@ -201,18 +201,16 @@ impl FloatFlowData {
do box.with_base |base| {
let noncontent_width = base.model.padding.left + base.model.padding.right +
base.model.border.left + base.model.border.right;
let noncontent_height = base.model.padding.top + base.model.padding.bottom +
base.model.border.top + base.model.border.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;
margin_height = base.model.margin.top + base.model.margin.bottom;
}

});

let info = PlacementInfo {
width: self.common.position.size.width + full_noncontent_width,
height: height + full_noncontent_height,
height: height + margin_height,
ceiling: clearance,
max_width: self.containing_width,
f_type: self.float_type,

5 comments on commit a422d54

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Aug 19, 2013

saw approval from metajack
at ILyoan@a422d54

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Aug 19, 2013

merging ILyoan/servo/acid1_margin = a422d54 into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Aug 19, 2013

ILyoan/servo/acid1_margin = a422d54 merged ok, testing candidate = 30bfd3f

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Aug 19, 2013

fast-forwarding master to auto = 30bfd3f

Please sign in to comment.
You can’t perform that action at this time.