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

Merge pull request #488 from eric93/baseline_final

Browse source 
Align text at baseline
This commit is contained in:
Patrick Walton 2013-05-28 15:32:19 -07:00
commit 6d16f11296
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/servo/layout/inline.rs
View file

@ -840,13 +840,23 @@ impl InlineFlowData {
// according to the `vertical-align` property of the containing block. // according to the `vertical-align` property of the containing block.
let halfleading = match cur_box { let halfleading = match cur_box {
TextRenderBoxClass(text_box) => { TextRenderBoxClass(text_box) => {
(text_box.run.font.metrics.em_size - line_height).scale_by(0.5) //ad is the AD height as defined by CSS 2.1 § 10.8.1
let ad = text_box.run.font.metrics.ascent + text_box.run.font.metrics.descent;
(line_height - ad).scale_by(0.5)
}, },
_ => Au(0), _ => Au(0),
}; };
//FIXME: when line-height is set on an inline element, the half leading
//distance can be negative.
let halfleading = Au::max(halfleading, Au(0));
let height = match cur_box {
TextRenderBoxClass(text_box) => text_box.run.font.metrics.ascent,
_ => cur_box.position().size.height
};
do cur_box.with_mut_base |base| { do cur_box.with_mut_base |base| {
let height = base.position.size.height;
base.position.origin.y = cur_y + halfleading + baseline_offset - height; base.position.origin.y = cur_y + halfleading + baseline_offset - height;
} }
} }