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

Compute actual linebox bounding boxes, and set heights of RenderBoxes in an InlineFlow..

Browse source
This commit is contained in:
Brian J. Burg 2012-10-17 14:04:24 -07:00
parent 7c26c56f49
commit 5fd7e72d06
1 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/servo/layout/inline.rs
View file

@ -551,24 +551,54 @@ impl FlowContext : InlineLayout {
} }
fn assign_height_inline(@self, _ctx: &LayoutContext) { fn assign_height_inline(@self, _ctx: &LayoutContext) {
// TODO: calculate linebox heights and set y-offsets // TODO: get from CSS 'line-height' property
let line_height = au::from_px(20); let line_height = au::from_px(20);
let mut cur_y = au(0); let mut cur_y = au(0);
for self.inline().boxes.each |box| { for self.inline().lines.eachi |i, line_span| {
let box_height = match *box { debug!("assign_height_inline: processing line %u with box span: %?", i, line_span);
@ImageBox(_,img) => au::from_px(img.size().height), // coords relative to left baseline
@TextBox(*) => { /* text boxes are initialized with dimensions */ let mut linebox_bounding_box = au::zero_rect();
box.d().position.size.height let boxes = &self.inline().boxes;
}, for uint::range(line_span.start as uint, (line_span.start + line_span.len) as uint) |box_i| {
@GenericBox(*) => au::from_px(30), /* TODO: should use CSS 'height'? */ let cur_box = boxes[box_i];
_ => fail fmt!("Tried to assign width to unknown Box variant: %?", box)
}; // compute box height.
// TODO: calculate linebox heights and set y-offsets cur_box.d().position.size.height = match cur_box {
box.d().position.origin.y = cur_y; @ImageBox(_,img) => au::from_px(img.size().height),
cur_y += au::max(line_height, box_height); @TextBox(*) => { /* text boxes are initialized with dimensions */
box.d().position.size.height = box_height; cur_box.d().position.size.height
} // for boxes.each |box| },
@GenericBox(*) => au::from_px(30), /* TODO: should use CSS 'height'? */
_ => fail fmt!("Tried to assign height to unknown Box variant: %s", cur_box.debug_str())
};
// compute bounding rect, with left baseline as origin.
// so, linebox height is a matter of lining up ideal baselines,
// and then using the union of all these rects.
let bounding_box = match cur_box {
// adjust to baseline coords
// TODO: account for padding, margin, border in bounding box?
@ImageBox(*) | @GenericBox(*) => {
let box_bounds = cur_box.d().position;
box_bounds.translate(&Point2D(au(0), -cur_box.d().position.size.height))
},
// adjust bounding box metric to box's horizontal offset
// TODO: can we trust the leading provided by font metrics?
@TextBox(_, data) => {
let text_bounds = data.run.metrics_for_range(data.offset, data.length).bounding_box;
text_bounds.translate(&Point2D(cur_box.d().position.origin.x, au(0)))
},
_ => fail fmt!("Tried to compute bounding box of unknown Box variant: %s", cur_box.debug_str())
};
cur_box.d().position.origin.y = cur_y;
debug!("assign_height_inline: bounding box for box b%d = %?", cur_box.d().id, bounding_box);
linebox_bounding_box = linebox_bounding_box.union(&bounding_box);
debug!("assign_height_inline: linebox bounding box = %?", linebox_bounding_box);
}
let linebox_height = linebox_bounding_box.size.height;
cur_y += au::max(line_height, linebox_height);
} // /lines.each |line_span|
self.d().position.size.height = cur_y; self.d().position.size.height = cur_y;
} }