Skip to content

/ servo

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.

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

Reapply line-height change with fixes for normal line-height and inline images. #532

Merged
merged 3 commits into from Jun 21, 2013
+203 −110
Merged

Reapply line-height change with fixes for normal line-height and inline images. #532

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb36464
Reapply "Add initial support for the line-height property. Line heigh…
jrfeenst Jun 21, 2013
5038924
Fix line height for "normal" line-height styles.
jrfeenst Jun 21, 2013
09a4ba8
Fix computing line height for generic boxes and images.
jrfeenst Jun 21, 2013
File filter...
Filter file types
Clear filters
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev Next

Fix line height for "normal" line-height styles.

  • Loading branch information
@jrfeenst
jrfeenst committed Jun 21, 2013
commit 5038924a1a9d05504340c16597256b4ca3a1d779
3 src/components/main/layout/inline.rs
View file
Open in desktop
@@ -797,8 +797,7 @@ impl InlineFlowData {
let text_bounds = run.metrics_for_range(range).bounding_box;
let em_size = text_bounds.size.height;
let line_height = match cur_box.line_height() {
// use the font's leading for normal
CSSLineHeightNormal => text_box.run.font.metrics.leading,
CSSLineHeightNormal => em_size.scale_by(1.14f),
CSSLineHeightNumber(l) => em_size.scale_by(l),
CSSLineHeightLength(Em(l)) => em_size.scale_by(l),
CSSLineHeightLength(Px(l)) => Au::from_frac_px(l),
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.