From 74ee7cca811d6f462ca253bced4e3f07e52d9300 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 18 Dec 2020 10:18:39 +0100
Subject: Format use declarations in `image::viewer`

---
 graphics/src/widget/image/viewer.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'graphics/src')

diff --git a/graphics/src/widget/image/viewer.rs b/graphics/src/widget/image/viewer.rs
index b6217ff7..0bcd09fc 100644
--- a/graphics/src/widget/image/viewer.rs
+++ b/graphics/src/widget/image/viewer.rs
@@ -2,10 +2,10 @@
 use crate::backend::{self, Backend};
 use crate::{Primitive, Renderer};
 
-use iced_native::{
-    image::{self, viewer},
-    mouse, Rectangle, Vector,
-};
+use iced_native::image;
+use iced_native::image::viewer;
+use iced_native::mouse;
+use iced_native::{Rectangle, Vector};
 
 impl<B> viewer::Renderer for Renderer<B>
 where
-- 
cgit 


From 21b10dc103638ead2a567b3426c937f39e9addbd Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 18 Dec 2020 10:44:24 +0100
Subject: Fix `layout` of `image::Viewer`

---
 graphics/src/widget/image/viewer.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'graphics/src')

diff --git a/graphics/src/widget/image/viewer.rs b/graphics/src/widget/image/viewer.rs
index 0bcd09fc..804f2be6 100644
--- a/graphics/src/widget/image/viewer.rs
+++ b/graphics/src/widget/image/viewer.rs
@@ -5,7 +5,7 @@ use crate::{Primitive, Renderer};
 use iced_native::image;
 use iced_native::image::viewer;
 use iced_native::mouse;
-use iced_native::{Rectangle, Vector};
+use iced_native::{Rectangle, Size, Vector};
 
 impl<B> viewer::Renderer for Renderer<B>
 where
@@ -15,7 +15,7 @@ where
         &mut self,
         state: &viewer::State,
         bounds: Rectangle,
-        image_bounds: Rectangle,
+        image_size: Size,
         translation: Vector,
         handle: image::Handle,
         is_mouse_over: bool,
@@ -28,7 +28,11 @@ where
                         translation,
                         content: Box::new(Primitive::Image {
                             handle,
-                            bounds: image_bounds,
+                            bounds: Rectangle {
+                                x: bounds.x,
+                                y: bounds.y,
+                                ..Rectangle::with_size(image_size)
+                            },
                         }),
                     }),
                     offset: Vector::new(0, 0),
@@ -38,8 +42,8 @@ where
                 if state.is_cursor_clicked() {
                     mouse::Interaction::Grabbing
                 } else if is_mouse_over
-                    && (image_bounds.width > bounds.width
-                        || image_bounds.height > bounds.height)
+                    && (image_size.width > bounds.width
+                        || image_size.height > bounds.height)
                 {
                     mouse::Interaction::Grab
                 } else {
-- 
cgit 


From 43ef85ae5c5b8901642e0832456ed907635600ff Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 18 Dec 2020 11:04:07 +0100
Subject: Rename `starting_cursor_pos` to `cursor_grabbed_at` in
 `image::Viewer`

---
 graphics/src/widget/image/viewer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'graphics/src')

diff --git a/graphics/src/widget/image/viewer.rs b/graphics/src/widget/image/viewer.rs
index 804f2be6..28dffc4f 100644
--- a/graphics/src/widget/image/viewer.rs
+++ b/graphics/src/widget/image/viewer.rs
@@ -39,7 +39,7 @@ where
                 }
             },
             {
-                if state.is_cursor_clicked() {
+                if state.is_cursor_grabbed() {
                     mouse::Interaction::Grabbing
                 } else if is_mouse_over
                     && (image_size.width > bounds.width
-- 
cgit