3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-19 00:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6652 from penpot/elenatorro-fix-load-fonts

Browse source 
🐛 Fix fonts initialization
This commit is contained in:
Alejandro Alonso 2025-06-09 09:31:00 +02:00 • committed by GitHub
commit d008ea9edd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 67 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

13
render-wasm/src/render/fonts.rs
View file

@ -66,7 +66,7 @@ impl FontStore {
is_emoji: bool,
is_fallback: bool,
) -> Result<(), String> {
if self.has_family(&family) {
if self.has_family(&family, is_emoji) {
return Ok(());
}
@ -92,9 +92,14 @@ impl FontStore {
Ok(())
}
pub fn has_family(&self, family: &FontFamily) -> bool {
let serialized = format!("{}", family);
self.font_provider.family_names().any(|x| x == serialized)
pub fn has_family(&self, family: &FontFamily, is_emoji: bool) -> bool {
let alias = format!("{}", family);
let font_name = if is_emoji {
DEFAULT_EMOJI_FONT
} else {
alias.as_str()
};
self.font_provider.family_names().any(|x| x == font_name)
}
pub fn get_fallback(&self) -> &HashSet<String> {