wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 22:01:47 +03:00
Code Issues Projects Releases Wiki Activity

fonts: allow svg fonts to take precedence over bitmap versions

Browse Source 
But note that we don't currently render svg

refs: https://github.com/wez/wezterm/issues/4148
This commit is contained in:
Wez Furlong 2023-08-14 20:23:17 -07:00
parent 0f1ffacefc
commit 8c77ea1d9e
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wezterm-font/src/parser.rs
View File

@ -617,21 +617,27 @@ impl ParsedFont {
// Reduce to matching weight
candidates.retain(|&idx| fonts[idx].weight == weight);
// Check for best matching pixel strike
if let Some((_distance, idx)) = candidates
// Check for best matching pixel strike, but only if all
// candidates have pixel strikes
if candidates
.iter()
.map(|&idx| {
let distance = fonts[idx]
.pixel_sizes
.iter()
.map(|&size| ((pixel_size as i32) - (size as i32)).abs())
.min()
.unwrap_or(i32::MAX);
(distance, idx)
})
.min()
.all(|&idx| !fonts[idx].pixel_sizes.is_empty())
{
return Some(idx);
if let Some((_distance, idx)) = candidates
.iter()
.map(|&idx| {
let distance = fonts[idx]
.pixel_sizes
.iter()
.map(|&size| ((pixel_size as i32) - (size as i32)).abs())
.min()
.unwrap_or(i32::MAX);
(distance, idx)
})
.min()
{
return Some(idx);
}
}
// The first one in this set is our best match