Implement `Widget::draw` for `Text`

4 files changed, 57 insertions, 17 deletions

diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 7e0af2cc..b8ff5d21 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -16,7 +16,6 @@ pub trait Backend {
     fn trim_measurements(&mut self) {}
 }
 
-/// A graphics backend that supports text rendering.
 pub trait Text {
     /// The icon font of the backend.
     const ICON_FONT: Font;
diff --git a/graphics/src/layer.rs b/graphics/src/layer.rs
index 9653a2e4..e5cb64c3 100644
--- a/graphics/src/layer.rs
+++ b/graphics/src/layer.rs
@@ -74,7 +74,7 @@ impl<'a> Layer<'a> {
     /// Distributes the given [`Primitive`] and generates a list of layers based
     /// on its contents.
     pub fn generate(
-        primitive: &'a Primitive,
+        primitives: &'a [Primitive],
         viewport: &Viewport,
     ) -> Vec<Self> {
         let first_layer =
@@ -82,12 +82,14 @@ impl<'a> Layer<'a> {
 
         let mut layers = vec![first_layer];
 
-        Self::process_primitive(
-            &mut layers,
-            Vector::new(0.0, 0.0),
-            primitive,
-            0,
-        );
+        for primitive in primitives {
+            Self::process_primitive(
+                &mut layers,
+                Vector::new(0.0, 0.0),
+                primitive,
+                0,
+            );
+        }
 
         layers
     }
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index cedffe7e..a708cb67 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -1,12 +1,14 @@
-use crate::{Backend, Defaults, Primitive};
+use crate::backend::{self, Backend};
+use crate::{Defaults, Primitive, Vector};
 use iced_native::layout;
-use iced_native::{Element, Rectangle};
+use iced_native::renderer;
+use iced_native::{Color, Element, Font, Rectangle};
 
 /// A backend-agnostic renderer that supports all the built-in widgets.
 #[derive(Debug)]
 pub struct Renderer<B: Backend> {
     backend: B,
-    primitive: Primitive,
+    primitives: Vec<Primitive>,
 }
 
 impl<B: Backend> Renderer<B> {
@@ -14,7 +16,7 @@ impl<B: Backend> Renderer<B> {
     pub fn new(backend: B) -> Self {
         Self {
             backend,
-            primitive: Primitive::None,
+            primitives: Vec::new(),
         }
     }
 
@@ -22,8 +24,8 @@ impl<B: Backend> Renderer<B> {
         &self.backend
     }
 
-    pub fn present(&mut self, f: impl FnOnce(&mut B, &Primitive)) {
-        f(&mut self.backend, &self.primitive);
+    pub fn present(&mut self, f: impl FnOnce(&mut B, &[Primitive])) {
+        f(&mut self.backend, &self.primitives);
     }
 }
 
@@ -45,5 +47,44 @@ where
         layout
     }
 
-    fn with_layer(&mut self, _bounds: Rectangle, _f: impl FnOnce(&mut Self)) {}
+    fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) {
+        let current_primitives =
+            std::mem::replace(&mut self.primitives, Vec::new());
+
+        f(self);
+
+        let layer_primitives =
+            std::mem::replace(&mut self.primitives, current_primitives);
+
+        self.primitives.push(Primitive::Clip {
+            bounds,
+            offset: Vector::new(0, 0),
+            content: Box::new(Primitive::Group {
+                primitives: layer_primitives,
+            }),
+        });
+    }
+
+    fn clear(&mut self) {
+        self.primitives.clear();
+    }
+}
+
+impl<B> renderer::Text for Renderer<B>
+where
+    B: Backend + backend::Text,
+{
+    type Font = Font;
+
+    fn fill_text(&mut self, text: renderer::text::Section<'_, Self::Font>) {
+        self.primitives.push(Primitive::Text {
+            content: text.content.to_string(),
+            bounds: text.bounds,
+            size: text.size.unwrap_or(f32::from(self.backend.default_size())),
+            color: text.color.unwrap_or(Color::BLACK),
+            font: text.font,
+            horizontal_alignment: text.horizontal_alignment,
+            vertical_alignment: text.vertical_alignment,
+        });
+    }
 }
diff --git a/graphics/src/widget/text.rs b/graphics/src/widget/text.rs
index 2ccd18a1..4ee2c616 100644
--- a/graphics/src/widget/text.rs
+++ b/graphics/src/widget/text.rs
@@ -15,8 +15,6 @@ impl<B> text::Renderer for Renderer<B>
 where
     B: Backend + backend::Text,
 {
-    type Font = Font;
-
     fn default_size(&self) -> u16 {
         self.backend().default_size()
     }