Add function to fill a Raw

pop-os · Dec 20, 2023 · 611ce16 · 611ce16
1 parent 81de422
commit 611ce16
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/core/src/renderer/null.rs b/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>,

diff --git a/core/src/text.rs b/core/src/text.rs
@@ -173,6 +173,9 @@ pub trait Renderer: crate::Renderer {
     /// 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 @@ pub trait Renderer: crate::Renderer {
         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(

diff --git a/graphics/src/renderer.rs b/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>,

diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
@@ -23,8 +23,7 @@ pub use geometry::Geometry;
 use crate::core::renderer;
 use crate::core::text::{self, Text};
 use crate::core::{Background, Color, Font, Pixels, Point, Rectangle, Vector};
-use crate::graphics::text::Editor;
-use crate::graphics::text::Paragraph;
+use crate::graphics::text::{Editor, Paragraph, Raw};
 use crate::graphics::Mesh;
 
 use std::borrow::Cow;
@@ -152,6 +151,7 @@ impl<T> text::Renderer for Renderer<T> {
     type Font = Font;
     type Paragraph = Paragraph;
     type Editor = Editor;
+    type Raw = Raw;
 
     const ICON_FONT: Font = iced_tiny_skia::Renderer::<T>::ICON_FONT;
     const CHECKMARK_ICON: char = iced_tiny_skia::Renderer::<T>::CHECKMARK_ICON;
@@ -198,6 +198,10 @@ impl<T> text::Renderer for Renderer<T> {
         );
     }
 
+    fn fill_raw(&mut self, raw: Self::Raw) {
+        delegate!(self, renderer, renderer.fill_raw(raw));
+    }
+
     fn fill_text(
         &mut self,
         text: Text<'_, Self::Font>,