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

font-config: cut over to new matcher

Browse Source 
refs: https://github.com/wez/wezterm/issues/655
This commit is contained in:
Wez Furlong 2021-04-07 22:29:10 -07:00
parent 7fb485d4ff
commit a8281e4984
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wezterm-font/src/locator/font_config.rs
View File

@ -1,5 +1,6 @@
use crate::fcwrap;
use crate::locator::{FontDataHandle, FontLocator};
use crate::parser::FontMatch;
use anyhow::Context;
use config::FontAttributes;
use fcwrap::{CharSet, Pattern as FontPattern};
@ -53,7 +54,7 @@ impl FontLocator for FontConfigFontLocator {
// so we need to parse the returned font
// here to see if we got what we asked for.
if let Ok(parsed) = crate::parser::ParsedFont::from_locator(&handle) {
if crate::parser::font_info_matches(attr, parsed.names()) {
if parsed.matches_attributes(attr) != FontMatch::NoMatch {
fonts.push(handle);
loaded.insert(attr.clone());
log::trace!("found font-config match for {:?}", parsed.names());