From 431171f975642fe96286f11fb75cd5b06827cc7f Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Fri, 15 May 2020 09:46:22 -0700
Subject: Rename and add to iced image module

---
 wgpu/src/renderer/widget.rs              |  2 +-
 wgpu/src/renderer/widget/image_pane.rs   | 39 --------------------------------
 wgpu/src/renderer/widget/image_viewer.rs | 39 ++++++++++++++++++++++++++++++++
 wgpu/src/widget.rs                       |  4 ++--
 wgpu/src/widget/image_pane.rs            |  6 -----
 wgpu/src/widget/image_viewer.rs          |  6 +++++
 6 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 wgpu/src/renderer/widget/image_pane.rs
 create mode 100644 wgpu/src/renderer/widget/image_viewer.rs
 delete mode 100644 wgpu/src/widget/image_pane.rs
 create mode 100644 wgpu/src/widget/image_viewer.rs

(limited to 'wgpu/src')

diff --git a/wgpu/src/renderer/widget.rs b/wgpu/src/renderer/widget.rs
index 6e1b7fe9..c9f288c7 100644
--- a/wgpu/src/renderer/widget.rs
+++ b/wgpu/src/renderer/widget.rs
@@ -18,4 +18,4 @@ mod svg;
 #[cfg(feature = "image")]
 mod image;
 #[cfg(feature = "image")]
-mod image_pane;
+mod image_viewer;
diff --git a/wgpu/src/renderer/widget/image_pane.rs b/wgpu/src/renderer/widget/image_pane.rs
deleted file mode 100644
index b5e86913..00000000
--- a/wgpu/src/renderer/widget/image_pane.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use crate::{Primitive, Renderer};
-use iced_native::{image, image_pane, mouse, Rectangle, Vector};
-
-impl image_pane::Renderer for Renderer {
-    fn draw(
-        &mut self,
-        state: &image_pane::State,
-        bounds: Rectangle,
-        image_bounds: Rectangle,
-        offset: (u32, u32),
-        handle: image::Handle,
-        is_mouse_over: bool,
-    ) -> Self::Output {
-        (
-            {
-                Primitive::Clip {
-                    bounds,
-                    offset: Vector::new(offset.0, offset.1),
-                    content: Box::new(Primitive::Image {
-                        handle,
-                        bounds: image_bounds,
-                    }),
-                }
-            },
-            {
-                if state.is_cursor_clicked() {
-                    mouse::Interaction::Grabbing
-                } else if is_mouse_over
-                    && (image_bounds.width > bounds.width
-                        || image_bounds.height > bounds.height)
-                {
-                    mouse::Interaction::Grab
-                } else {
-                    mouse::Interaction::Idle
-                }
-            },
-        )
-    }
-}
diff --git a/wgpu/src/renderer/widget/image_viewer.rs b/wgpu/src/renderer/widget/image_viewer.rs
new file mode 100644
index 00000000..b8546d43
--- /dev/null
+++ b/wgpu/src/renderer/widget/image_viewer.rs
@@ -0,0 +1,39 @@
+use crate::{Primitive, Renderer};
+use iced_native::{image, image_viewer, mouse, Rectangle, Vector};
+
+impl image_viewer::Renderer for Renderer {
+    fn draw(
+        &mut self,
+        state: &image_viewer::State,
+        bounds: Rectangle,
+        image_bounds: Rectangle,
+        offset: (u32, u32),
+        handle: image::Handle,
+        is_mouse_over: bool,
+    ) -> Self::Output {
+        (
+            {
+                Primitive::Clip {
+                    bounds,
+                    offset: Vector::new(offset.0, offset.1),
+                    content: Box::new(Primitive::Image {
+                        handle,
+                        bounds: image_bounds,
+                    }),
+                }
+            },
+            {
+                if state.is_cursor_clicked() {
+                    mouse::Interaction::Grabbing
+                } else if is_mouse_over
+                    && (image_bounds.width > bounds.width
+                        || image_bounds.height > bounds.height)
+                {
+                    mouse::Interaction::Grab
+                } else {
+                    mouse::Interaction::Idle
+                }
+            },
+        )
+    }
+}
diff --git a/wgpu/src/widget.rs b/wgpu/src/widget.rs
index a62a610d..e968c366 100644
--- a/wgpu/src/widget.rs
+++ b/wgpu/src/widget.rs
@@ -50,8 +50,8 @@ pub use canvas::Canvas;
 
 #[cfg(feature = "image")]
 #[doc(no_inline)]
-pub mod image_pane;
+pub mod image_viewer;
 
 #[cfg(feature = "image")]
 #[doc(no_inline)]
-pub use image_pane::ImagePane;
+pub use image_viewer::ImageViewer;
diff --git a/wgpu/src/widget/image_pane.rs b/wgpu/src/widget/image_pane.rs
deleted file mode 100644
index aa30a8cc..00000000
--- a/wgpu/src/widget/image_pane.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-//! Zoom and pan on an image.
-
-pub use iced_native::image_pane::State;
-
-/// A widget that can display an image with the ability to zoom in/out and pan.
-pub type ImagePane<'a> = iced_native::ImagePane<'a>;
diff --git a/wgpu/src/widget/image_viewer.rs b/wgpu/src/widget/image_viewer.rs
new file mode 100644
index 00000000..ec44e30a
--- /dev/null
+++ b/wgpu/src/widget/image_viewer.rs
@@ -0,0 +1,6 @@
+//! 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>;
-- 
cgit