wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-23 23:21:08 +03:00
Code Issues Projects Releases Wiki Activity

macos: reduce memory utilization in font fallback case

Browse Source 
refs: https://github.com/wez/wezterm/issues/559
This commit is contained in:
Wez Furlong 2021-03-20 22:27:08 -07:00
parent f4a8b14a2c
commit 5eb6a15312
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wezterm-font/src/locator/core_text.rs
View File

@ -54,7 +54,7 @@ fn handle_from_descriptor(descriptor: &CTFontDescriptor) -> Option<FontDataHandl
let name = descriptor.display_name();
let family_name = descriptor.family_name();
let data = std::fs::read(path).ok()?;
let data = std::fs::read(&path).ok()?;
let size = fonts_in_collection(&data).unwrap_or(1);
let mut handle = FontDataHandle::Memory {
@ -70,7 +70,9 @@ fn handle_from_descriptor(descriptor: &CTFontDescriptor) -> Option<FontDataHandl
let parsed = crate::parser::ParsedFont::from_locator(&handle).ok()?;
let names = parsed.names();
if names.full_name == family_name || names.family.as_ref() == Some(&family_name) {
return Some(handle);
// Switch to an OnDisk handle so that we don't hold
// all of the fallback fonts in memory
return Some(FontDataHandle::OnDisk { path, index });
}
}