Skip to content

Commit

Permalink
Fix compute height using 'height' property
Browse files Browse the repository at this point in the history
  • Loading branch information
@recrack
recrack committed Nov 14, 2013
1 parent 0126286 commit ff84a4f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/components/main/layout/block.rs
View file
Expand Up @@ -212,9 +212,10 @@ impl BlockFlow {
for &box in self.box.iter() {
let base = box.base();
let style = base.style();
let maybe_height = MaybeAuto::from_style(style.Box.height, Au::new(0));
let maybe_height = maybe_height.specified_or_zero();
height = geometry::max(height, maybe_height);
height = match MaybeAuto::from_style(style.Box.height, Au::new(0)) {
Auto => height,
Specified(value) => value
};
}

let mut noncontent_height = Au::new(0);
Expand All @@ -238,7 +239,6 @@ impl BlockFlow {
model.margin.bottom;
}

//TODO(eatkinson): compute heights using the 'height' property.
self.base.position.size.height = height + noncontent_height;

if inorder {
Expand Down

37 comments on commit ff84a4f

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at recrack@ff84a4f

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging recrack/servo/fix_compute_height = ff84a4f into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

recrack/servo/fix_compute_height = ff84a4f merged ok, testing candidate = 1d932fb

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/614
failure: http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/569

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at recrack@ff84a4f

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging recrack/servo/fix_compute_height = ff84a4f into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

recrack/servo/fix_compute_height = ff84a4f merged ok, testing candidate = 0dbf7f9

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/570

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at recrack@ff84a4f

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging recrack/servo/fix_compute_height = ff84a4f into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

recrack/servo/fix_compute_height = ff84a4f merged ok, testing candidate = 538f05c

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/616

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at recrack@ff84a4f

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging recrack/servo/fix_compute_height = ff84a4f into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

recrack/servo/fix_compute_height = ff84a4f merged ok, testing candidate = 81d671b

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/617

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at recrack@ff84a4f

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging recrack/servo/fix_compute_height = ff84a4f into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

recrack/servo/fix_compute_height = ff84a4f merged ok, testing candidate = 373a1d8

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/618

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at recrack@ff84a4f

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging recrack/servo/fix_compute_height = ff84a4f into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

recrack/servo/fix_compute_height = ff84a4f merged ok, testing candidate = 603ba7a

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/619

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at recrack@ff84a4f

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging recrack/servo/fix_compute_height = ff84a4f into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

recrack/servo/fix_compute_height = ff84a4f merged ok, testing candidate = 1dd47a2

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
exception: http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/620

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at recrack@ff84a4f

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging recrack/servo/fix_compute_height = ff84a4f into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

recrack/servo/fix_compute_height = ff84a4f merged ok, testing candidate = 85fc9dc

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/621

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at recrack@ff84a4f

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging recrack/servo/fix_compute_height = ff84a4f into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

recrack/servo/fix_compute_height = ff84a4f merged ok, testing candidate = 38b1702

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/622
success: http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/577

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 38b1702

Please sign in to comment.