From 5d045c2e9a639f8bbf43e68fde9091be702b3ab8 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Tue, 26 May 2020 17:15:55 -0700
Subject: rename to image::Viewer

---
 wgpu/src/renderer/widget/image.rs        |  2 ++
 wgpu/src/renderer/widget/image/viewer.rs | 39 ++++++++++++++++++++++++++++++++
 wgpu/src/renderer/widget/image_viewer.rs | 39 --------------------------------
 3 files changed, 41 insertions(+), 39 deletions(-)
 create mode 100644 wgpu/src/renderer/widget/image/viewer.rs
 delete mode 100644 wgpu/src/renderer/widget/image_viewer.rs

(limited to 'wgpu/src/renderer/widget')

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
new file mode 100644
index 00000000..72e5d93b
--- /dev/null
+++ b/wgpu/src/renderer/widget/image/viewer.rs
@@ -0,0 +1,39 @@
+use crate::{Primitive, Renderer};
+use iced_native::{image, mouse, Rectangle, Vector};
+
+impl image::viewer::Renderer for Renderer {
+    fn draw(
+        &mut self,
+        state: &image::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
deleted file mode 100644
index b8546d43..00000000
--- a/wgpu/src/renderer/widget/image_viewer.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-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
-                }
-            },
-        )
-    }
-}
-- 
cgit