From 3740c9d852a62e669f6d29e2575b7f133f8441a7 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Sat, 21 Oct 2023 18:33:08 +0200
Subject: [PATCH] WIP

---
 crates/gpui2/src/app.rs         | 4 ++++
 crates/gpui2/src/text_system.rs | 4 ++++
 crates/zed2/src/main.rs         | 3 +--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/crates/gpui2/src/app.rs b/crates/gpui2/src/app.rs
index b1ede0ff2d9e579f05336acd654393a5fea64995..d3118323abc464d9ef5d6de8c9a34d65b421cd37 100644
--- a/crates/gpui2/src/app.rs
+++ b/crates/gpui2/src/app.rs
@@ -95,6 +95,10 @@ impl App {
     pub fn executor(&self) -> Executor {
         self.0.lock().executor.clone()
     }
+
+    pub fn text_system(&self) -> Arc<TextSystem> {
+        self.0.lock().text_system.clone()
+    }
 }
 
 type Handler = Box<dyn Fn(&mut AppContext) -> bool + Send + Sync + 'static>;
diff --git a/crates/gpui2/src/text_system.rs b/crates/gpui2/src/text_system.rs
index 3b16bb506c1f89e7316f4918dcc3052021deda25..7c96b1a180c70fb2039995e969890ff5878b3733 100644
--- a/crates/gpui2/src/text_system.rs
+++ b/crates/gpui2/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 {
diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs
index 9580ad480c1c03e472303bf8be0a08adb4d1ed81..f30e4873ebb91e388eccc4d13124b3f763880359 100644
--- a/crates/zed2/src/main.rs
+++ b/crates/zed2/src/main.rs
@@ -652,8 +652,7 @@ fn load_embedded_fonts(app: &App) {
             });
         }
     }));
-    app.platform()
-        .fonts()
+    app.text_system()
         .add_fonts(&embedded_fonts.into_inner())
         .unwrap();
 }