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

Support line_height better in layout 2020

Browse source
This commit is contained in:
Anthony Ramine 2019-11-22 10:38:59 +01:00
parent b3d30d284e
commit 85b2a4dc64
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/layout_2020/flow/inline.rs
View file

@ -292,6 +292,7 @@ impl TextRun {
use gfx::font::{ShapingFlags, ShapingOptions}; use gfx::font::{ShapingFlags, ShapingOptions};
use style::computed_values::text_rendering::T as TextRendering; use style::computed_values::text_rendering::T as TextRendering;
use style::computed_values::word_break::T as WordBreak; use style::computed_values::word_break::T as WordBreak;
use style::values::generics::text::LineHeight;
let font_style = self.parent_style.clone_font(); let font_style = self.parent_style.clone_font();
let inherited_text_style = self.parent_style.get_inherited_text(); let inherited_text_style = self.parent_style.get_inherited_text();
@ -375,10 +376,11 @@ impl TextRun {
break; break;
} }
} }
// https://www.w3.org/TR/CSS2/visudet.html#propdef-line-height let line_height = match self.parent_style.get_inherited_text().line_height {
// 'normal': LineHeight::Normal => font_line_gap.into(),
// “set the used value to a "reasonable" value based on the font of the element.” LineHeight::Number(n) => font_size * n.0,
let line_height = font_size * 1.2; LineHeight::Length(l) => l.0,
};
let content_rect = Rect { let content_rect = Rect {
start_corner: Vec2 { start_corner: Vec2 {
block: Length::zero(), block: Length::zero(),