diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-05-19 22:55:12 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-05-19 23:19:39 +0200 |
| commit | 720e7756f2afe30706b6b1a7fbde86b9f15e1d8c (patch) | |
| tree | 3a55248a4b25654b1d63b8c547fd0f653471606d /graphics/src/widget | |
| parent | e6180912488db4d59fbffcb46c5930282306cb92 (diff) | |
| download | iced-720e7756f2afe30706b6b1a7fbde86b9f15e1d8c.tar.gz iced-720e7756f2afe30706b6b1a7fbde86b9f15e1d8c.tar.bz2 iced-720e7756f2afe30706b6b1a7fbde86b9f15e1d8c.zip | |
Move `Layer` to `iced_graphics`
Diffstat (limited to 'graphics/src/widget')
| -rw-r--r-- | graphics/src/widget/canvas/frame.rs | 2 | ||||
| -rw-r--r-- | graphics/src/widget/image.rs | 2 | ||||
| -rw-r--r-- | graphics/src/widget/svg.rs | 2 |
3 files changed, 3 insertions, 3 deletions
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 |