Introduce custom backend-specific primitives

1 files changed, 43 insertions, 27 deletions

diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 7e70a766..9acfc2b7 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -1,5 +1,5 @@
 //! Create a renderer from a [`Backend`].
-use crate::backend;
+use crate::backend::{self, Backend};
 use crate::Primitive;
 
 use iced_core::image;
@@ -16,13 +16,13 @@ use std::marker::PhantomData;
 
 /// A backend-agnostic renderer that supports all the built-in widgets.
 #[derive(Debug)]
-pub struct Renderer<B, Theme> {
+pub struct Renderer<B: Backend, Theme> {
     backend: B,
-    primitives: Vec<Primitive>,
+    primitives: Vec<Primitive<B::Primitive>>,
     theme: PhantomData<Theme>,
 }
 
-impl<B, T> Renderer<B, T> {
+impl<B: Backend, T> Renderer<B, T> {
     /// Creates a new [`Renderer`] from the given [`Backend`].
     pub fn new(backend: B) -> Self {
         Self {
@@ -38,7 +38,7 @@ impl<B, T> Renderer<B, T> {
     }
 
     /// Enqueues the given [`Primitive`] in the [`Renderer`] for drawing.
-    pub fn draw_primitive(&mut self, primitive: Primitive) {
+    pub fn draw_primitive(&mut self, primitive: Primitive<B::Primitive>) {
         self.primitives.push(primitive);
     }
 
@@ -46,13 +46,42 @@ impl<B, T> Renderer<B, T> {
     /// of the [`Renderer`].
     pub fn with_primitives<O>(
         &mut self,
-        f: impl FnOnce(&mut B, &[Primitive]) -> O,
+        f: impl FnOnce(&mut B, &[Primitive<B::Primitive>]) -> O,
     ) -> O {
         f(&mut self.backend, &self.primitives)
     }
+
+    pub fn start_layer(&mut self) -> Vec<Primitive<B::Primitive>> {
+        std::mem::take(&mut self.primitives)
+    }
+
+    pub fn end_layer(
+        &mut self,
+        primitives: Vec<Primitive<B::Primitive>>,
+        bounds: Rectangle,
+    ) {
+        let layer = std::mem::replace(&mut self.primitives, primitives);
+
+        self.primitives.push(Primitive::group(layer).clip(bounds));
+    }
+
+    pub fn start_translation(&mut self) -> Vec<Primitive<B::Primitive>> {
+        std::mem::take(&mut self.primitives)
+    }
+
+    pub fn end_translation(
+        &mut self,
+        primitives: Vec<Primitive<B::Primitive>>,
+        translation: Vector,
+    ) {
+        let layer = std::mem::replace(&mut self.primitives, primitives);
+
+        self.primitives
+            .push(Primitive::group(layer).translate(translation));
+    }
 }
 
-impl<B, T> iced_core::Renderer for Renderer<B, T> {
+impl<B: Backend, T> iced_core::Renderer for Renderer<B, T> {
     type Theme = T;
 
     fn layout<Message>(
@@ -64,13 +93,11 @@ impl<B, T> iced_core::Renderer for Renderer<B, T> {
     }
 
     fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) {
-        let current = std::mem::take(&mut self.primitives);
+        let current = self.start_layer();
 
         f(self);
 
-        let layer = std::mem::replace(&mut self.primitives, current);
-
-        self.primitives.push(Primitive::group(layer).clip(bounds));
+        self.end_layer(current, bounds);
     }
 
     fn with_translation(
@@ -78,14 +105,11 @@ impl<B, T> iced_core::Renderer for Renderer<B, T> {
         translation: Vector,
         f: impl FnOnce(&mut Self),
     ) {
-        let current = std::mem::take(&mut self.primitives);
+        let current = self.start_translation();
 
         f(self);
 
-        let layer = std::mem::replace(&mut self.primitives, current);
-
-        self.primitives
-            .push(Primitive::group(layer).translate(translation));
+        self.end_translation(current, translation);
     }
 
     fn fill_quad(
@@ -109,7 +133,7 @@ impl<B, T> iced_core::Renderer for Renderer<B, T> {
 
 impl<B, T> text::Renderer for Renderer<B, T>
 where
-    B: backend::Text,
+    B: Backend + backend::Text,
 {
     type Font = Font;
 
@@ -188,7 +212,7 @@ where
 
 impl<B, T> image::Renderer for Renderer<B, T>
 where
-    B: backend::Image,
+    B: Backend + backend::Image,
 {
     type Handle = image::Handle;
 
@@ -203,7 +227,7 @@ where
 
 impl<B, T> svg::Renderer for Renderer<B, T>
 where
-    B: backend::Svg,
+    B: Backend + backend::Svg,
 {
     fn dimensions(&self, handle: &svg::Handle) -> Size<u32> {
         self.backend().viewport_dimensions(handle)
@@ -222,11 +246,3 @@ where
         })
     }
 }
-
-#[cfg(feature = "geometry")]
-impl<B, T> crate::geometry::Renderer for Renderer<B, T> {
-    fn draw(&mut self, layers: Vec<crate::Geometry>) {
-        self.primitives
-            .extend(layers.into_iter().map(crate::Geometry::into));
-    }
-}