From 03b34931383e701c39c653a7662a616fe21a0947 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 14 Oct 2021 16:07:22 +0700
Subject: Remove trait-specific draw logic in `iced_native`

---
 graphics/src/widget/image.rs | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'graphics/src/widget/image.rs')

diff --git a/graphics/src/widget/image.rs b/graphics/src/widget/image.rs
index bdf03de3..b55ba32f 100644
--- a/graphics/src/widget/image.rs
+++ b/graphics/src/widget/image.rs
@@ -3,10 +3,8 @@ pub mod viewer;
 
 use crate::backend::{self, Backend};
 
-use crate::{Primitive, Renderer};
+use crate::Renderer;
 use iced_native::image;
-use iced_native::mouse;
-use iced_native::Layout;
 
 pub use iced_native::image::{Handle, Image, Viewer};
 
@@ -17,18 +15,4 @@ where
     fn dimensions(&self, handle: &image::Handle) -> (u32, u32) {
         self.backend().dimensions(handle)
     }
-
-    fn draw(
-        &mut self,
-        handle: image::Handle,
-        layout: Layout<'_>,
-    ) -> Self::Output {
-        (
-            Primitive::Image {
-                handle,
-                bounds: layout.bounds(),
-            },
-            mouse::Interaction::default(),
-        )
-    }
 }
-- 
cgit 


From 1afbc98544327b5454b862bec938dc76c4d38fa0 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 25 Oct 2021 15:03:57 +0700
Subject: Implement `Widget::draw` for `Image`

---
 graphics/src/widget/image.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'graphics/src/widget/image.rs')

diff --git a/graphics/src/widget/image.rs b/graphics/src/widget/image.rs
index b55ba32f..dc2d1657 100644
--- a/graphics/src/widget/image.rs
+++ b/graphics/src/widget/image.rs
@@ -3,8 +3,9 @@ pub mod viewer;
 
 use crate::backend::{self, Backend};
 
-use crate::Renderer;
+use crate::{Primitive, Renderer};
 use iced_native::image;
+use iced_native::Layout;
 
 pub use iced_native::image::{Handle, Image, Viewer};
 
@@ -15,4 +16,11 @@ where
     fn dimensions(&self, handle: &image::Handle) -> (u32, u32) {
         self.backend().dimensions(handle)
     }
+
+    fn draw(&mut self, handle: image::Handle, layout: Layout<'_>) {
+        self.draw_primitive(Primitive::Image {
+            handle,
+            bounds: layout.bounds(),
+        })
+    }
 }
-- 
cgit 


From 8b1587421822d9a0e7fa1c2224447da7007dbd30 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 28 Oct 2021 17:01:23 +0700
Subject: Implement `Widget::draw` for `image::Viewer`

---
 graphics/src/widget/image.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'graphics/src/widget/image.rs')

diff --git a/graphics/src/widget/image.rs b/graphics/src/widget/image.rs
index dc2d1657..242d36d7 100644
--- a/graphics/src/widget/image.rs
+++ b/graphics/src/widget/image.rs
@@ -2,10 +2,9 @@
 pub mod viewer;
 
 use crate::backend::{self, Backend};
+use crate::{Primitive, Rectangle, Renderer};
 
-use crate::{Primitive, Renderer};
 use iced_native::image;
-use iced_native::Layout;
 
 pub use iced_native::image::{Handle, Image, Viewer};
 
@@ -17,10 +16,7 @@ where
         self.backend().dimensions(handle)
     }
 
-    fn draw(&mut self, handle: image::Handle, layout: Layout<'_>) {
-        self.draw_primitive(Primitive::Image {
-            handle,
-            bounds: layout.bounds(),
-        })
+    fn draw(&mut self, handle: image::Handle, bounds: Rectangle) {
+        self.draw_primitive(Primitive::Image { handle, bounds })
     }
 }
-- 
cgit 


From 0aafcde0ef1533c9eeba0379de8c0082e30c7504 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 31 Oct 2021 15:35:12 +0700
Subject: Remove `widget` module re-exports in `iced_native`

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

(limited to 'graphics/src/widget/image.rs')

diff --git a/graphics/src/widget/image.rs b/graphics/src/widget/image.rs
index 242d36d7..0131dd82 100644
--- a/graphics/src/widget/image.rs
+++ b/graphics/src/widget/image.rs
@@ -4,9 +4,9 @@ pub mod viewer;
 use crate::backend::{self, Backend};
 use crate::{Primitive, Rectangle, Renderer};
 
-use iced_native::image;
+use iced_native::widget::image;
 
-pub use iced_native::image::{Handle, Image, Viewer};
+pub use iced_native::widget::image::{Handle, Image, Viewer};
 
 impl<B> image::Renderer for Renderer<B>
 where
-- 
cgit 


From c4186a71b746b603984e5fe1926a8cef6e8dcfcb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 31 Oct 2021 16:20:50 +0700
Subject: Introduce first-class `image` module in `iced_native`

---
 graphics/src/widget/image.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'graphics/src/widget/image.rs')

diff --git a/graphics/src/widget/image.rs b/graphics/src/widget/image.rs
index 0131dd82..ad8159de 100644
--- a/graphics/src/widget/image.rs
+++ b/graphics/src/widget/image.rs
@@ -4,9 +4,10 @@ pub mod viewer;
 use crate::backend::{self, Backend};
 use crate::{Primitive, Rectangle, Renderer};
 
-use iced_native::widget::image;
+use iced_native::image;
 
-pub use iced_native::widget::image::{Handle, Image, Viewer};
+pub use iced_native::widget::image::{Image, Viewer};
+pub use image::Handle;
 
 impl<B> image::Renderer for Renderer<B>
 where
-- 
cgit