summaryrefslogtreecommitdiffstats
path: root/wgpu/src
diff options
context:
space:
mode:
authorLibravatar Cory Forsstrom <cforsstrom18@gmail.com>2020-05-26 17:15:55 -0700
committerLibravatar Cory Forsstrom <cforsstrom18@gmail.com>2020-05-26 17:16:05 -0700
commit5d045c2e9a639f8bbf43e68fde9091be702b3ab8 (patch)
tree8c5069d619654e5eb1bae9e1bc80751c672786c8 /wgpu/src
parent431171f975642fe96286f11fb75cd5b06827cc7f (diff)
downloadiced-5d045c2e9a639f8bbf43e68fde9091be702b3ab8.tar.gz
iced-5d045c2e9a639f8bbf43e68fde9091be702b3ab8.tar.bz2
iced-5d045c2e9a639f8bbf43e68fde9091be702b3ab8.zip
rename to image::Viewer
Diffstat (limited to '')
-rw-r--r--wgpu/src/renderer/widget.rs2
-rw-r--r--wgpu/src/renderer/widget/image.rs2
-rw-r--r--wgpu/src/renderer/widget/image/viewer.rs (renamed from wgpu/src/renderer/widget/image_viewer.rs)6
-rw-r--r--wgpu/src/widget.rs8
-rw-r--r--wgpu/src/widget/image_viewer.rs6
5 files changed, 5 insertions, 19 deletions
diff --git a/wgpu/src/renderer/widget.rs b/wgpu/src/renderer/widget.rs
index c9f288c7..37421fbe 100644
--- a/wgpu/src/renderer/widget.rs
+++ b/wgpu/src/renderer/widget.rs
@@ -17,5 +17,3 @@ mod svg;
#[cfg(feature = "image")]
mod image;
-#[cfg(feature = "image")]
-mod image_viewer;
diff --git a/wgpu/src/renderer/widget/image.rs b/wgpu/src/renderer/widget/image.rs
index c4c04984..d32c078a 100644
--- a/wgpu/src/renderer/widget/image.rs
+++ b/wgpu/src/renderer/widget/image.rs
@@ -1,3 +1,5 @@
+mod viewer;
+
use crate::{Primitive, Renderer};
use iced_native::{image, mouse, Layout};
diff --git a/wgpu/src/renderer/widget/image_viewer.rs b/wgpu/src/renderer/widget/image/viewer.rs
index b8546d43..72e5d93b 100644
--- a/wgpu/src/renderer/widget/image_viewer.rs
+++ b/wgpu/src/renderer/widget/image/viewer.rs
@@ -1,10 +1,10 @@
use crate::{Primitive, Renderer};
-use iced_native::{image, image_viewer, mouse, Rectangle, Vector};
+use iced_native::{image, mouse, Rectangle, Vector};
-impl image_viewer::Renderer for Renderer {
+impl image::viewer::Renderer for Renderer {
fn draw(
&mut self,
- state: &image_viewer::State,
+ state: &image::State,
bounds: Rectangle,
image_bounds: Rectangle,
offset: (u32, u32),
diff --git a/wgpu/src/widget.rs b/wgpu/src/widget.rs
index e968c366..32ccad17 100644
--- a/wgpu/src/widget.rs
+++ b/wgpu/src/widget.rs
@@ -47,11 +47,3 @@ pub mod canvas;
#[cfg(feature = "canvas")]
#[doc(no_inline)]
pub use canvas::Canvas;
-
-#[cfg(feature = "image")]
-#[doc(no_inline)]
-pub mod image_viewer;
-
-#[cfg(feature = "image")]
-#[doc(no_inline)]
-pub use image_viewer::ImageViewer;
diff --git a/wgpu/src/widget/image_viewer.rs b/wgpu/src/widget/image_viewer.rs
deleted file mode 100644
index ec44e30a..00000000
--- a/wgpu/src/widget/image_viewer.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-//! Zoom and pan on an image.
-
-pub use iced_native::image_viewer::State;
-
-/// A widget that can display an image with the ability to zoom in/out and pan.
-pub type ImageViewer<'a> = iced_native::ImageViewer<'a>;