remove re-export on

iced-rs · May 27, 2020 · 017be70 · 017be70
1 parent 5dd62ba
commit 017be70
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs
@@ -1,6 +1,6 @@
 //! Display images in your user interface.
 pub mod viewer;
-pub use viewer::{State, Viewer};
+pub use viewer::Viewer;
 
 use crate::{layout, Element, Hasher, Layout, Length, Point, Size, Widget};
 

diff --git a/src/widget.rs b/src/widget.rs
@@ -30,7 +30,9 @@ mod platform {
     #[cfg_attr(docsrs, doc(cfg(feature = "image")))]
     pub mod image {
         //! Display images in your user interface.
-        pub use iced_winit::image::{Handle, Image, State, Viewer};
+        pub use iced_winit::image::{Handle, Image, Viewer};
+
+        pub use iced_winit::image::viewer;
     }
 
     #[cfg_attr(docsrs, doc(cfg(feature = "svg")))]

diff --git a/wgpu/src/renderer/widget/image/viewer.rs b/wgpu/src/renderer/widget/image/viewer.rs
@@ -1,10 +1,13 @@
 use crate::{Primitive, Renderer};
-use iced_native::{image, mouse, Rectangle, Vector};
+use iced_native::{
+    image::{self, viewer},
+    mouse, Rectangle, Vector,
+};
 
-impl image::viewer::Renderer for Renderer {
+impl viewer::Renderer for Renderer {
     fn draw(
         &mut self,
-        state: &image::State,
+        state: &viewer::State,
         bounds: Rectangle,
         image_bounds: Rectangle,
         translation: Vector,