Rename `Renderer::Primitive` to `Renderer::Output`

9 files changed, 14 insertions, 13 deletions

diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs
index 036efd27..cdb44554 100644
--- a/wgpu/src/renderer.rs
+++ b/wgpu/src/renderer.rs
@@ -100,8 +100,8 @@ impl Renderer {
 
     fn draw(
         &mut self,
-        target: &mut Target,
         primitive: &Primitive,
+        target: &mut Target,
     ) -> MouseCursor {
         log::debug!("Drawing");
 
@@ -154,6 +154,7 @@ impl Renderer {
 
         MouseCursor::OutOfBounds
     }
+
     fn draw_primitive(&mut self, primitive: &Primitive) {
         match primitive {
             Primitive::None => {}
@@ -243,7 +244,7 @@ impl Renderer {
 
 impl iced_native::Renderer for Renderer {
     // TODO: Add `MouseCursor` here (?)
-    type Primitive = Primitive;
+    type Output = Primitive;
 }
 
 impl Windowed for Renderer {
@@ -259,10 +260,10 @@ impl Windowed for Renderer {
 
     fn draw(
         &mut self,
+        output: &Self::Output,
         target: &mut Target,
-        primitive: &Primitive,
     ) -> MouseCursor {
-        self.draw(target, primitive)
+        self.draw(output, target)
     }
 }
 
@@ -273,7 +274,7 @@ impl Debugger for Renderer {
         layout: Layout<'_>,
         cursor_position: Point,
         _color: Color,
-    ) -> Self::Primitive {
+    ) -> Self::Output {
         // TODO: Include a bordered box to display layout bounds
         widget.draw(self, layout, cursor_position)
     }
diff --git a/wgpu/src/renderer/button.rs b/wgpu/src/renderer/button.rs
index 00fcd0eb..33789379 100644
--- a/wgpu/src/renderer/button.rs
+++ b/wgpu/src/renderer/button.rs
@@ -21,7 +21,7 @@ impl button::Renderer for Renderer {
         button: &Button<Message, Self>,
         layout: Layout<'_>,
         cursor_position: Point,
-    ) -> Self::Primitive {
+    ) -> Self::Output {
         let bounds = layout.bounds();
 
         Primitive::Group {
diff --git a/wgpu/src/renderer/checkbox.rs b/wgpu/src/renderer/checkbox.rs
index 16d5734f..003df7e5 100644
--- a/wgpu/src/renderer/checkbox.rs
+++ b/wgpu/src/renderer/checkbox.rs
@@ -11,7 +11,7 @@ impl checkbox::Renderer for Renderer {
         _checkbox: &Checkbox<Message>,
         _layout: Layout<'_>,
         _cursor_position: Point,
-    ) -> Self::Primitive {
+    ) -> Self::Output {
         // TODO
         Primitive::None
     }
diff --git a/wgpu/src/renderer/column.rs b/wgpu/src/renderer/column.rs
index 1b9adad6..c83a7de1 100644
--- a/wgpu/src/renderer/column.rs
+++ b/wgpu/src/renderer/column.rs
@@ -7,7 +7,7 @@ impl column::Renderer for Renderer {
         column: &Column<'_, Message, Self>,
         layout: Layout<'_>,
         cursor_position: Point,
-    ) -> Self::Primitive {
+    ) -> Self::Output {
         Primitive::Group {
             primitives: column
                 .children
diff --git a/wgpu/src/renderer/image.rs b/wgpu/src/renderer/image.rs
index bacc430d..f77a95db 100644
--- a/wgpu/src/renderer/image.rs
+++ b/wgpu/src/renderer/image.rs
@@ -10,7 +10,7 @@ impl image::Renderer<&str> for Renderer {
         &mut self,
         _image: &Image<&str>,
         _layout: Layout<'_>,
-    ) -> Self::Primitive {
+    ) -> Self::Output {
         Primitive::None
     }
 }
diff --git a/wgpu/src/renderer/radio.rs b/wgpu/src/renderer/radio.rs
index fdc0a0fc..0a34fee9 100644
--- a/wgpu/src/renderer/radio.rs
+++ b/wgpu/src/renderer/radio.rs
@@ -11,7 +11,7 @@ impl radio::Renderer for Renderer {
         _radio: &Radio<Message>,
         _layout: Layout<'_>,
         _cursor_position: Point,
-    ) -> Self::Primitive {
+    ) -> Self::Output {
         Primitive::None
     }
 }
diff --git a/wgpu/src/renderer/row.rs b/wgpu/src/renderer/row.rs
index be9e4ede..b6baf61f 100644
--- a/wgpu/src/renderer/row.rs
+++ b/wgpu/src/renderer/row.rs
@@ -7,7 +7,7 @@ impl row::Renderer for Renderer {
         row: &Row<'_, Message, Self>,
         layout: Layout<'_>,
         cursor_position: Point,
-    ) -> Self::Primitive {
+    ) -> Self::Output {
         Primitive::Group {
             primitives: row
                 .children
diff --git a/wgpu/src/renderer/slider.rs b/wgpu/src/renderer/slider.rs
index 2e76022d..2eacdc89 100644
--- a/wgpu/src/renderer/slider.rs
+++ b/wgpu/src/renderer/slider.rs
@@ -11,7 +11,7 @@ impl slider::Renderer for Renderer {
         _slider: &Slider<Message>,
         _layout: Layout<'_>,
         _cursor_position: Point,
-    ) -> Self::Primitive {
+    ) -> Self::Output {
         Primitive::None
     }
 }
diff --git a/wgpu/src/renderer/text.rs b/wgpu/src/renderer/text.rs
index c89c0b3e..61349533 100644
--- a/wgpu/src/renderer/text.rs
+++ b/wgpu/src/renderer/text.rs
@@ -67,7 +67,7 @@ impl text::Renderer for Renderer {
         })
     }
 
-    fn draw(&mut self, text: &Text, layout: Layout<'_>) -> Self::Primitive {
+    fn draw(&mut self, text: &Text, layout: Layout<'_>) -> Self::Output {
         Primitive::Text {
             content: text.content.clone(),
             size: f32::from(text.size.unwrap_or(20)),