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

Merge remote-tracking branch 'origin/main' into vi-editor

Browse source
This commit is contained in:
Jeremy Soller 2023-11-17 08:30:08 -07:00
commit 66a6803cf8
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/font/fallback/mod.rs
View file

@ -130,10 +130,14 @@ impl<'a> Iterator for FontFallbackIter<'a> {
}
// Set a monospace fallback if Monospace family is not found
if self.default_families[self.default_i - 1] == &Family::Monospace
&& self.font_system.db().face(*id).map(|f| f.monospaced) == Some(true)
&& monospace_fallback.is_none()
{
monospace_fallback = Some(id);
if let Some(face_info) = self.font_system.db().face(*id) {
// Don't use emoji fonts as Monospace
if face_info.monospaced && !face_info.post_script_name.contains("Emoji") {
monospace_fallback = Some(id);
}
}
}
}
// If default family is Monospace fallback to first monospaced font

1
src/shape.rs
View file

@ -345,6 +345,7 @@ fn shape_skip(
.map(|(i, codepoint)| {
let glyph_id = charmap.map(codepoint);
let x_advance = glyph_metrics.advance_width(glyph_id);
let attrs = attrs_list.get_span(i);
ShapeGlyph {
start: i,