leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move line height calculation to LayoutLine

Browse source
This commit is contained in:
Jeremy Soller 2024-06-07 10:52:26 -06:00
parent 31d3ceca51
commit 21e88ebc45
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/buffer.rs
View file

@ -126,17 +126,9 @@ impl<'b> Iterator for LayoutRunIter<'b> {
continue;
}
let mut line_height_opt: Option<f32> = None;
for glyph in layout_line.glyphs.iter() {
if let Some(glyph_line_height) = glyph.line_height_opt {
line_height_opt = match line_height_opt {
Some(line_height) => Some(line_height.max(glyph_line_height)),
None => Some(glyph_line_height),
};
}
}
let line_height = line_height_opt.unwrap_or(self.buffer.metrics.line_height);
let line_height = layout_line
.line_height_opt
.unwrap_or(self.buffer.metrics.line_height);
let line_top = self.line_top;
let glyph_height = layout_line.max_ascent + layout_line.max_descent;
let centering_offset = (line_height - glyph_height) / 2.0;