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

Fall back to buffer line height only if no glyphs found

Browse source
This commit is contained in:
Jeremy Soller 2024-06-06 15:52:52 -06:00
parent 020701734e
commit 497003e67e
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/buffer.rs
View file

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