Cosmic text refactor

Cargo.toml

@@ -133,10 +133,10 @@ iced_accessibility = { version = "0.1", path = "accessibility" }
 async-std = "1.0"
 bitflags = "1.0"
 bytemuck = { version = "1.0", features = ["derive"] }
-cosmic-text = "0.10"
+cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git", branch = "refactor" }
 futures = "0.3"
 glam = "0.24"
-glyphon = { git = "https://github.com/grovesNL/glyphon.git", rev = "2caa9fc5e5923c1d827d177c3619cab7e9885b85" }
+glyphon = { git = "https://github.com/jackpot51/glyphon.git", branch = "refactor" }
 guillotiere = "0.6"
 half = "2.2"
 image = "0.24"
@@ -152,7 +152,7 @@ ouroboros = "0.17"
 palette = "0.7"
 qrcode = { version = "0.12", default-features = false }
 raw-window-handle = "0.5"
-resvg = "0.36"
+resvg = "0.37"
 rustc-hash = "1.0"
 sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "2e9bf9f" }
 smol = "1.0"
@@ -174,4 +174,4 @@ winapi = "0.3"
 window_clipboard = "0.3"
 [workspace.dependencies.winit]
 git = "https://github.com/pop-os/winit.git"
-branch = "master"
+branch = "master"

core/src/renderer/null.rs

@@ -44,6 +44,7 @@ impl text::Renderer for Null {
     type Font = Font;
     type Paragraph = ();
     type Editor = ();
+    type Raw = ();
 
     const ICON_FONT: Font = Font::DEFAULT;
     const CHECKMARK_ICON: char = '0';
@@ -77,6 +78,8 @@ impl text::Renderer for Null {
     ) {
     }
 
+    fn fill_raw(&mut self, _raw: Self::Raw) {}
+
     fn fill_text(
         &mut self,
         _paragraph: Text<'_, Self::Font>,

core/src/text.rs

@@ -173,6 +173,9 @@
     /// The [`Editor`] of this [`Renderer`].
     type Editor: Editor<Font = Self::Font> + 'static;
 
+    /// The [`Raw`] of this [`Renderer`].
+    type Raw;
+
     /// The icon font of the backend.
     const ICON_FONT: Self::Font;
 
@@ -215,6 +218,9 @@
         clip_bounds: Rectangle,
     );
 
+    /// Draws the given [`Raw`]
+    fn fill_raw(&mut self, raw: Self::Raw);
+
     /// Draws the given [`Text`] at the given position and with the given
     /// [`Color`].
     fn fill_text(

graphics/src/renderer.rs

@@ -142,6 +142,7 @@ where
     type Font = Font;
     type Paragraph = text::Paragraph;
     type Editor = text::Editor;
+    type Raw = text::Raw;
 
     const ICON_FONT: Font = Font::with_name("Iced-Icons");
     const CHECKMARK_ICON: char = '\u{f00c}';
@@ -189,6 +190,10 @@ where
         });
     }
 
+    fn fill_raw(&mut self, raw: Self::Raw) {
+        self.primitives.push(Primitive::RawText(raw));
+    }
+
     fn fill_text(
         &mut self,
         text: Text<'_, Self::Font>,