Move `Canvas` and `QRCode` to `iced` crate

Rename `canvas` modules to `geometry` in graphics subcrates

3 files changed, 7 insertions, 9 deletions

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 6883a953..050c6c75 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -436,8 +436,6 @@ fn adjust_clip_mask(
 }
 
 impl iced_graphics::Backend for Backend {
-    type Geometry = ();
-
     fn trim_measurements(&mut self) {
         self.text_pipeline.trim_measurement_cache();
     }
diff --git a/tiny_skia/src/canvas.rs b/tiny_skia/src/geometry.rs
index 958063d2..73fc1ebd 100644
--- a/tiny_skia/src/canvas.rs
+++ b/tiny_skia/src/geometry.rs
@@ -1,9 +1,9 @@
 use crate::{Point, Primitive, Rectangle, Size, Vector};
 
-use iced_native::widget::canvas::fill::{self, Fill};
-use iced_native::widget::canvas::stroke::{self, Stroke};
-use iced_native::widget::canvas::{Path, Style, Text};
-use iced_native::Gradient;
+use iced_graphics::geometry::fill::{self, Fill};
+use iced_graphics::geometry::stroke::{self, Stroke};
+use iced_graphics::geometry::{Path, Style, Text};
+use iced_graphics::Gradient;
 
 pub struct Frame {
     size: Size,
@@ -152,7 +152,7 @@ impl Frame {
 }
 
 fn convert_path(path: &Path) -> tiny_skia::Path {
-    use iced_native::widget::canvas::path::lyon_path;
+    use iced_graphics::geometry::path::lyon_path;
 
     let mut builder = tiny_skia::PathBuilder::new();
     let mut last_point = Default::default();
diff --git a/tiny_skia/src/lib.rs b/tiny_skia/src/lib.rs
index e66e6412..ef5c6b1d 100644
--- a/tiny_skia/src/lib.rs
+++ b/tiny_skia/src/lib.rs
@@ -4,8 +4,8 @@ mod backend;
 mod settings;
 mod text;
 
-#[cfg(feature = "canvas")]
-pub mod canvas;
+#[cfg(feature = "geometry")]
+pub mod geometry;
 
 pub use iced_graphics::primitive;