Load embedded fonts

Marshall Bowers created 2 years ago

Change summary

crates/gpui3/src/text_system.rs     |  4 ++++
crates/storybook2/src/storybook2.rs | 31 +++++++++++++++++--------------
crates/ui2/src/story.rs             |  2 +-
3 files changed, 22 insertions(+), 15 deletions(-)

Detailed changes

crates/gpui3/src/text_system.rs

@@ -55,6 +55,10 @@ impl TextSystem {
         }
     }
 
+    pub fn add_fonts(&self, fonts: &[Arc<Vec<u8>>]) -> Result<()> {
+        self.platform_text_system.add_fonts(fonts)
+    }
+
     pub fn font_id(&self, font: &Font) -> Result<FontId> {
         let font_id = self.font_ids_by_font.read().get(font).copied();
         if let Some(font_id) = font_id {

crates/storybook2/src/storybook2.rs

@@ -10,8 +10,8 @@ use std::sync::Arc;
 
 use clap::Parser;
 use gpui3::{
-    div, px, size, view, AnyView, BorrowAppContext, Bounds, Context, Element, ViewContext,
-    WindowBounds, WindowOptions,
+    div, px, size, view, AnyView, AppContext, AssetSource, BorrowAppContext, Bounds, Context,
+    Element, ViewContext, WindowBounds, WindowOptions,
 };
 use log::LevelFilter;
 use simplelog::SimpleLogger;
@@ -54,6 +54,8 @@ fn main() {
 
     let asset_source = Arc::new(Assets);
     gpui3::App::production(asset_source).run(move |cx| {
+        load_embedded_fonts(cx);
+
         let selector =
             story_selector.unwrap_or(StorySelector::Component(ComponentStory::Workspace));
 
@@ -112,15 +114,16 @@ impl StoryWrapper {
     }
 }
 
-// fn load_embedded_fonts(platform: &dyn gpui2::Platform) {
-//     let font_paths = Assets.list("fonts");
-//     let mut embedded_fonts = Vec::new();
-//     for font_path in &font_paths {
-//         if font_path.ends_with(".ttf") {
-//             let font_path = &*font_path;
-//             let font_bytes = Assets.load(font_path).unwrap().to_vec();
-//             embedded_fonts.push(Arc::from(font_bytes));
-//         }
-//     }
-//     platform.fonts().add_fonts(&embedded_fonts).unwrap();
-// }
+fn load_embedded_fonts(cx: &AppContext) {
+    let font_paths = Assets.list(&"fonts".into()).unwrap();
+    let mut embedded_fonts = Vec::new();
+    for font_path in &font_paths {
+        if font_path.ends_with(".ttf") {
+            let font_path = &*font_path;
+            let font_bytes = Assets.load(font_path).unwrap().to_vec();
+            embedded_fonts.push(Arc::from(font_bytes));
+        }
+    }
+
+    cx.text_system().add_fonts(&embedded_fonts).unwrap();
+}

crates/ui2/src/story.rs

@@ -14,7 +14,7 @@ impl Story {
             .flex_col()
             .pt_2()
             .px_4()
-            .font("Zed Mono Extended")
+            .font("Zed Mono")
             .bg(color.background)
     }