fonts: fix other platforms and tests

Ungh, shouldn't push before I'm awake :-/ refs: #648
wezterm · Apr 5, 2021 · a5bb5be · a5bb5be
1 parent d7c7c27
commit a5bb5be
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/wezterm-font/src/lib.rs b/wezterm-font/src/lib.rs
@@ -280,7 +280,7 @@ impl FontConfigInner {
         }
 
         for attr in &attributes {
-            if !attr.is_fallback && !loaded.contains(attr) {
+            if !attr.is_synthetic && !attr.is_fallback && !loaded.contains(attr) {
                 let styled_extra = if attr.bold || attr.italic {
                     ". A bold or italic variant of the font was requested; \
                     TrueType and OpenType fonts don't have an automatic way to \

diff --git a/wezterm-font/src/locator/core_text.rs b/wezterm-font/src/locator/core_text.rs
@@ -151,6 +151,7 @@ fn build_fallback_list_impl() -> anyhow::Result<Vec<FontDataHandle>> {
         bold: false,
         italic: false,
         is_fallback: true,
+        is_synthetic: true,
     };
     if let Ok(descriptor) = descriptor_from_attr(&symbols) {
         if let Some(handle) = handle_from_descriptor(&descriptor) {

diff --git a/wezterm-font/src/locator/gdi.rs b/wezterm-font/src/locator/gdi.rs
@@ -309,6 +309,7 @@ impl FontLocator for GdiFontLocator {
                         italic: false,
                         family: font.family_name(),
                         is_fallback: true,
+                        is_synthetic: true,
                     };
 
                     if !resolved.contains(&attr) {

diff --git a/wezterm-font/src/shaper/harfbuzz.rs b/wezterm-font/src/shaper/harfbuzz.rs
@@ -469,6 +469,7 @@ mod test {
                 family: "JetBrains Mono".into(),
                 bold: false,
                 is_fallback: false,
+                is_synthetic: false,
                 italic: false,
             })
             .unwrap()