Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Checkpoint

Browse source
This commit is contained in:
Nathan Sobo 2023-09-27 23:05:39 -06:00
parent 8be8047b8d
commit 1ee70a0146
4 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/gpui3/src/text_system.rs
View file

@ -99,19 +99,13 @@ impl TextSystem {
let result =
self.platform_text_system.advance(font_id, glyph_id)? / self.units_per_em(font)? as f32;
let result = result * font_size;
Ok(todo!())
Ok(result * font_size)
}
pub fn units_per_em(&self, font: &Font) -> Result<u32> {
self.read_metrics(font, |metrics| metrics.units_per_em as u32)
}
pub fn line_height(&self, font_size: Pixels) -> Pixels {
todo!()
// self.font_cache.line_height(font_size)
}
pub fn cap_height(&self, font: &Font, font_size: Pixels) -> Result<Pixels> {
self.read_metrics(font, |metrics| metrics.cap_height(font_size))
}
@ -128,8 +122,12 @@ impl TextSystem {
self.read_metrics(font, |metrics| metrics.descent(font_size))
}
pub fn baseline_offset(&self, font: &Font, font_size: Pixels) -> Result<Pixels> {
let line_height = self.line_height(font_size);
pub fn baseline_offset(
&self,
font: &Font,
font_size: Pixels,
line_height: Pixels,
) -> Result<Pixels> {
let ascent = self.ascent(font, font_size)?;
let descent = self.descent(font, font_size)?;
let padding_top = (line_height - ascent - descent) / 2.;