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

Merge pull request #132 from trimental/monospaced-fallback

Browse source 
Fallback to monospaced font if Monospace family is not found
This commit is contained in:
Jeremy Soller 2023-06-08 12:38:17 -06:00 • committed by GitHub
commit 39895c988a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,6 +112,7 @@ impl<'a> Iterator for FontFallbackIter<'a> {
fn next(&mut self) -> Option<Self::Item> {
while self.default_i < self.default_families.len() {
self.default_i += 1;
let mut monospace_fallback = None;
for id in self.font_ids.iter() {
let default_family = self
.font_system
@ -122,6 +123,19 @@ impl<'a> Iterator for FontFallbackIter<'a> {
return Some(font);
}
}
// 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 default family is Monospace fallback to first monospaced font
if let Some(id) = monospace_fallback {
if let Some(font) = self.font_system.get_font(*id) {
return Some(font);
}
}
}