improv: use cosmic_text's persistent cached fonts

Author: hojjatabdollahi

Cargo.lock

@@ -84,11 +84,11 @@ selector = ["iced_runtime/selector"]
 
 # Enables basic text shaping by default
 fira-sans = [
-    "iced_renderer/fira-sans",
+  "iced_renderer/fira-sans",
 ] # Embeds Fira Sans into the final application; useful for testing and Wasm builds
 advanced = [
-    "iced_core/advanced",
-    "iced_widget/advanced",
+  "iced_core/advanced",
+  "iced_widget/advanced",
 ] # Enables the advanced module
 basic-shaping = ["iced_core/basic-shaping"]
 # Enables advanced text shaping by default
@@ -107,16 +107,16 @@ linux-theme-detection = ["iced_winit/linux-theme-detection"]
 x11 = ["iced_renderer/x11", "iced_winit/x11"]
 # Enables the `accesskit` accessibility library
 a11y = [
-    "iced_accessibility",
-    "iced_core/a11y",
-    "iced_widget/a11y",
-    "iced_winit?/a11y",
+  "iced_accessibility",
+  "iced_core/a11y",
+  "iced_widget/a11y",
+  "iced_winit?/a11y",
 ]
 # Enables the winit shell. Conflicts with `wayland` and `glutin`.
 winit = [
-    "iced_winit",
-    "iced_accessibility?/accesskit_winit",
-    "iced_program/winit",
+  "iced_winit",
+  "iced_accessibility?/accesskit_winit",
+  "iced_program/winit",
 ]
 wayland = ["iced_renderer/wayland", "iced_winit/wayland"]
 cctk = ["iced_winit/cctk", "iced_widget/cctk", "iced_core/cctk", "wayland"]
@@ -171,25 +171,25 @@ strip = "debuginfo"
 
 [workspace]
 members = [
-    "beacon",
-    "core",
-    "debug",
-    "devtools",
-    "futures",
-    "graphics",
-    "highlighter",
-    "program",
-    "renderer",
-    "runtime",
-    "selector",
-    "test",
-    "tester",
-    "tiny_skia",
-    "wgpu",
-    "widget",
-    "winit",
-    "examples/*",
-    "accessibility",
+  "beacon",
+  "core",
+  "debug",
+  "devtools",
+  "futures",
+  "graphics",
+  "highlighter",
+  "program",
+  "renderer",
+  "runtime",
+  "selector",
+  "test",
+  "tester",
+  "tiny_skia",
+  "wgpu",
+  "widget",
+  "winit",
+  "examples/*",
+  "accessibility",
 ]
 exclude = ["examples/integration"]
 
@@ -226,8 +226,8 @@ iced_winit = { version = "0.14.0", path = "winit", default-features = false }
 bincode = "1.3"
 cargo-hot = { version = "0.1", package = "cargo-hot-protocol" }
 futures = { version = "0.3", default-features = false, features = [
-    "std",
-    "async-await",
+  "std",
+  "async-await",
 ] }
 glam = "0.25"
 iced_accessibility = { version = "0.1", path = "accessibility" }
@@ -238,8 +238,8 @@ async-std = "1.0"
 bitflags = "2.5"
 bytemuck = { version = "1.0", features = ["derive"] }
 bytes = "1.6"
-cosmic-text = "0.19"
-cryoglyph = { git = "https://github.com/iced-rs/cryoglyph.git", rev = "e429a025df36ab8145708acb309080ae3deec17a" }
+cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git", rev = "4fe1195e6451d6aaa3dc383895d6fd366ea9fc7b" }
+cryoglyph = { git = "https://github.com/pop-os/glyphon.git", rev = "273130949ef4ffc652e3d5e5255219f1f079868e" }
 dark-light = "1.0"
 resvg = "0.45"
 web-sys = "0.3.69"
@@ -271,25 +271,25 @@ smol_str = "0.3"
 sysinfo = "0.33"
 thiserror = "2"
 tiny-skia = { version = "0.11", default-features = false, features = [
-    "std",
-    "simd",
+  "std",
+  "simd",
 ] }
 cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "c253ec1" }
 softbuffer = { git = "https://github.com/pop-os/softbuffer", tag = "cosmic-4.0" }
 syntect = "5.2"
 tokio = "1.0"
 tracing = "0.1"
 two-face = { version = "0.4", default-features = false, features = [
-    "syntect-default-fancy",
+  "syntect-default-fancy",
 ] }
 unicode-segmentation = "1.0"
 url = "2.5"
 wasm-bindgen-futures = "0.4"
 wasmtimer = "0.4.2"
 web-time = "1.1"
 wgpu = { version = "28.0", default-features = false, features = [
-    "std",
-    "wgsl",
+  "std",
+  "wgsl",
 ] }
 wayland-protocols = { version = "0.32.1", features = ["staging"] }
 wayland-client = { version = "0.31.5" }

Cargo.toml

@@ -133,7 +133,7 @@ pub fn font_system() -> &'static RwLock<FontSystem> {
 
     FONT_SYSTEM.get_or_init(|| {
         RwLock::new(FontSystem {
-            raw: cosmic_text::FontSystem::new_with_fonts([
+            raw: cosmic_text::FontSystem::new_with_fonts_and_cache([
                 cosmic_text::fontdb::Source::Binary(Arc::new(
                     include_bytes!("../fonts/Iced-Icons.ttf").as_slice(),
                 )),

graphics/src/text.rs

@@ -1,5 +1,6 @@
 use crate::core::svg;
 use crate::core::{Color, Size};
+use crate::graphics::text;
 use crate::image::atlas::{self, Atlas};
 
 use resvg::tiny_skia;
@@ -40,6 +41,7 @@ pub struct Cache {
     rasterized_hits: FxHashSet<(u64, u32, u32, ColorFilter)>,
     should_trim: bool,
     fontdb: Option<Arc<usvg::fontdb::Database>>,
+    fontdb_version: Option<text::Version>,
 }
 
 type ColorFilter = Option<[u8; 4]>;
@@ -51,12 +53,12 @@ impl Cache {
             return self.svgs.get(&handle.id()).unwrap();
         }
 
-        // TODO: Reuse `cosmic-text` font database
-        if self.fontdb.is_none() {
-            let mut fontdb = usvg::fontdb::Database::new();
-            fontdb.load_system_fonts();
+        let font_system = text::font_system().read().expect("Read font system");
+        let version = font_system.version();
 
-            self.fontdb = Some(Arc::new(fontdb));
+        if self.fontdb_version != Some(version) {
+            self.fontdb = Some(Arc::new(font_system.db().clone()));
+            self.fontdb_version = Some(version);
         }
 
         let options = usvg::Options {