Move `Layer` to `iced_graphics`

4 files changed, 5 insertions, 5 deletions

diff --git a/graphics/src/widget.rs b/graphics/src/widget.rs
index d9c91d77..1f6d6559 100644
--- a/graphics/src/widget.rs
+++ b/graphics/src/widget.rs
@@ -10,18 +10,18 @@
 pub mod button;
 pub mod checkbox;
 pub mod container;
+pub mod image;
 pub mod pane_grid;
 pub mod progress_bar;
 pub mod radio;
 pub mod scrollable;
 pub mod slider;
+pub mod svg;
 pub mod text_input;
 
 mod column;
-mod image;
 mod row;
 mod space;
-mod svg;
 mod text;
 
 #[doc(no_inline)]
diff --git a/graphics/src/widget/canvas/frame.rs b/graphics/src/widget/canvas/frame.rs
index 5262ab4e..48d28d95 100644
--- a/graphics/src/widget/canvas/frame.rs
+++ b/graphics/src/widget/canvas/frame.rs
@@ -304,11 +304,11 @@ impl Frame {
     pub fn into_geometry(mut self) -> Geometry {
         if !self.buffers.indices.is_empty() {
             self.primitives.push(Primitive::Mesh2D {
-                size: self.size,
                 buffers: triangle::Mesh2D {
                     vertices: self.buffers.vertices,
                     indices: self.buffers.indices,
                 },
+                size: self.size,
             });
         }
 
diff --git a/graphics/src/widget/image.rs b/graphics/src/widget/image.rs
index 79d82cb1..ea49febe 100644
--- a/graphics/src/widget/image.rs
+++ b/graphics/src/widget/image.rs
@@ -4,7 +4,7 @@ use iced_native::image;
 use iced_native::mouse;
 use iced_native::Layout;
 
-pub use iced_native::Image;
+pub use iced_native::image::{Handle, Image};
 
 impl<B> image::Renderer for Renderer<B>
 where
diff --git a/graphics/src/widget/svg.rs b/graphics/src/widget/svg.rs
index b1aa7cea..8c681478 100644
--- a/graphics/src/widget/svg.rs
+++ b/graphics/src/widget/svg.rs
@@ -2,7 +2,7 @@ use crate::backend::{self, Backend};
 use crate::{Primitive, Renderer};
 use iced_native::{mouse, svg, Layout};
 
-pub use iced_native::Svg;
+pub use iced_native::svg::{Handle, Svg};
 
 impl<B> svg::Renderer for Renderer<B>
 where