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

layout: Take padding into account for inline boxes

Browse source
This commit is contained in:
Patrick Walton 2014-03-28 13:00:36 -07:00
parent 9874d0f9d3
commit e6665a2f14
4 changed files with 155 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/components/main/layout/inline.rs
View file

@ -21,7 +21,6 @@ use gfx::display_list::{ContentLevel, StackingContext};
use servo_util::geometry::Au;
use servo_util::geometry;
use servo_util::range::Range;
use std::cell::RefCell;
use std::mem;
use std::u16;
use style::computed_values::{text_align, vertical_align, white_space};
@ -630,20 +629,19 @@ impl Flow for InlineFlow {
child_base.floats = Floats::new();
}
let mut min_width = Au::new(0);
let mut pref_width = Au::new(0);
let mut intrinsic_widths = IntrinsicWidths::new();
for box_ in self.boxes.iter() {
debug!("Flow: measuring {:s}", box_.debug_str());
box_.compute_borders(box_.style());
let (this_minimum_width, this_preferred_width) =
box_.minimum_and_preferred_widths();
min_width = Au::max(min_width, this_minimum_width);
pref_width = Au::max(pref_width, this_preferred_width);
let box_intrinsic_widths = box_.intrinsic_widths();
intrinsic_widths.minimum_width = geometry::max(intrinsic_widths.minimum_width,
box_intrinsic_widths.minimum_width);
intrinsic_widths.preferred_width = geometry::max(intrinsic_widths.preferred_width,
box_intrinsic_widths.preferred_width);
}
self.base.min_width = min_width;
self.base.pref_width = pref_width;
self.base.intrinsic_widths = intrinsic_widths;
self.base.num_floats = num_floats;
}