Merge pull request #1932 from iced-rs/generic-graphics-primitive

Backend-specific primitives

2 files changed, 5 insertions, 4 deletions

diff --git a/widget/src/canvas/program.rs b/widget/src/canvas/program.rs
index 929ee285..b3f6175e 100644
--- a/widget/src/canvas/program.rs
+++ b/widget/src/canvas/program.rs
@@ -1,7 +1,7 @@
 use crate::canvas::event::{self, Event};
 use crate::canvas::mouse;
 use crate::core::Rectangle;
-use crate::graphics::geometry::{self, Geometry};
+use crate::graphics::geometry;
 
 /// The state and logic of a [`Canvas`].
 ///
@@ -51,7 +51,7 @@ where
         theme: &Renderer::Theme,
         bounds: Rectangle,
         cursor: mouse::Cursor,
-    ) -> Vec<Geometry>;
+    ) -> Vec<Renderer::Geometry>;
 
     /// Returns the current mouse interaction of the [`Program`].
     ///
@@ -93,7 +93,7 @@ where
         theme: &Renderer::Theme,
         bounds: Rectangle,
         cursor: mouse::Cursor,
-    ) -> Vec<Geometry> {
+    ) -> Vec<Renderer::Geometry> {
         T::draw(self, state, renderer, theme, bounds, cursor)
     }
 
diff --git a/widget/src/qr_code.rs b/widget/src/qr_code.rs
index 06be93c0..51a541fd 100644
--- a/widget/src/qr_code.rs
+++ b/widget/src/qr_code.rs
@@ -7,6 +7,7 @@ use crate::core::widget::Tree;
 use crate::core::{
     Color, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
 };
+use crate::graphics::geometry::Renderer as _;
 use crate::Renderer;
 use thiserror::Error;
 
@@ -121,7 +122,7 @@ impl<'a, Message, Theme> Widget<Message, Renderer<Theme>> for QRCode<'a> {
         let translation = Vector::new(bounds.x, bounds.y);
 
         renderer.with_translation(translation, |renderer| {
-            renderer.draw_primitive(geometry.0);
+            renderer.draw(vec![geometry]);
         });
     }
 }