Fix fallback font (#4062)

Conrad Irwin created 2 years ago

As this is used if you mis-spell "buffer_font_family", it should be
monospace.

Also treat "Zed Mono" and "Zed Sans" as valid fonts

Follow up to #4045

Release Notes:

- Fixes font validation to allow "Zed Mono" as a valid font

Change summary

crates/gpui/src/text_system.rs | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)

Detailed changes

crates/gpui/src/text_system.rs

@@ -59,14 +59,22 @@ impl TextSystem {
             fallback_font_stack: smallvec![
                 // TODO: This is currently Zed-specific.
                 // We should allow GPUI users to provide their own fallback font stack.
-                font("Zed Sans"),
+                font("Zed Mono"),
                 font("Helvetica")
             ],
         }
     }
 
     pub fn all_font_families(&self) -> Vec<String> {
-        self.platform_text_system.all_font_families()
+        let mut families = self.platform_text_system.all_font_families();
+        families.append(
+            &mut self
+                .fallback_font_stack
+                .iter()
+                .map(|font| font.family.to_string())
+                .collect(),
+        );
+        families
     }
     pub fn add_fonts(&self, fonts: &[Arc<Vec<u8>>]) -> Result<()> {
         self.platform_text_system.add_fonts(fonts)