Skip to content

Align text at baseline #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcwalton merged 2 commits into from
May 28, 2013
Merged

Align text at baseline #488

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad9fad0
Tweak inline layout so text is baseline-aligned
May 27, 2013
1fd9a8f
Merge with TextRenderBox refactor
May 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/components/servo/layout/inline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,13 +840,23 @@ impl InlineFlowData {
// according to the `vertical-align` property of the containing block.
let halfleading = match cur_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),
};

//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| {
let height = base.position.size.height;
base.position.origin.y = cur_y + halfleading + baseline_offset - height;
}
}
Expand Down