1 files changed, 17 insertions, 36 deletions

diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs
index fbe38bfc..51d7ba26 100644
--- a/native/src/widget/image.rs
+++ b/native/src/widget/image.rs
@@ -1,5 +1,6 @@
 //! Display images in your user interface.
-use crate::{layout, Element, Hasher, Layout, Length, Point, Size, Widget};
+use crate::layout;
+use crate::{Element, Hasher, Layout, Length, Point, Rectangle, Size, Widget};
 
 use std::{
     hash::{Hash, Hasher as _},
@@ -27,8 +28,6 @@ pub struct Image {
 
 impl Image {
     /// Creates a new [`Image`] with the given path.
-    ///
-    /// [`Image`]: struct.Image.html
     pub fn new<T: Into<Handle>>(handle: T) -> Self {
         Image {
             handle: handle.into(),
@@ -38,16 +37,12 @@ impl Image {
     }
 
     /// Sets the width of the [`Image`] boundaries.
-    ///
-    /// [`Image`]: struct.Image.html
     pub fn width(mut self, width: Length) -> Self {
         self.width = width;
         self
     }
 
     /// Sets the height of the [`Image`] boundaries.
-    ///
-    /// [`Image`]: struct.Image.html
     pub fn height(mut self, height: Length) -> Self {
         self.height = height;
         self
@@ -97,11 +92,15 @@ where
         _defaults: &Renderer::Defaults,
         layout: Layout<'_>,
         _cursor_position: Point,
+        _viewport: &Rectangle,
     ) -> Renderer::Output {
         renderer.draw(self.handle.clone(), layout)
     }
 
     fn hash_layout(&self, state: &mut Hasher) {
+        struct Marker;
+        std::any::TypeId::of::<Marker>().hash(state);
+
         self.handle.hash(state);
         self.width.hash(state);
         self.height.hash(state);
@@ -109,8 +108,6 @@ where
 }
 
 /// An [`Image`] handle.
-///
-/// [`Image`]: struct.Image.html
 #[derive(Debug, Clone)]
 pub struct Handle {
     id: u64,
@@ -120,18 +117,16 @@ pub struct Handle {
 impl Handle {
     /// Creates an image [`Handle`] pointing to the image of the given path.
     ///
-    /// [`Handle`]: struct.Handle.html
+    /// Makes an educated guess about the image format by examining the data in the file.
     pub fn from_path<T: Into<PathBuf>>(path: T) -> Handle {
         Self::from_data(Data::Path(path.into()))
     }
 
     /// Creates an image [`Handle`] containing the image pixels directly. This
-    /// function expects the input data to be provided as a `Vec<u8>` of BGRA 
+    /// function expects the input data to be provided as a `Vec<u8>` of BGRA
     /// pixels.
     ///
     /// This is useful if you have already decoded your image.
-    ///
-    /// [`Handle`]: struct.Handle.html
     pub fn from_pixels(width: u32, height: u32, pixels: Vec<u8>) -> Handle {
         Self::from_data(Data::Pixels {
             width,
@@ -142,10 +137,10 @@ impl Handle {
 
     /// Creates an image [`Handle`] containing the image data directly.
     ///
+    /// Makes an educated guess about the image format by examining the given data.
+    ///
     /// This is useful if you already have your image loaded in-memory, maybe
     /// because you downloaded or generated it procedurally.
-    ///
-    /// [`Handle`]: struct.Handle.html
     pub fn from_memory(bytes: Vec<u8>) -> Handle {
         Self::from_data(Data::Bytes(bytes))
     }
@@ -161,29 +156,22 @@ impl Handle {
     }
 
     /// Returns the unique identifier of the [`Handle`].
-    ///
-    /// [`Handle`]: struct.Handle.html
     pub fn id(&self) -> u64 {
         self.id
     }
 
     /// Returns a reference to the image [`Data`].
-    ///
-    /// [`Data`]: enum.Data.html
     pub fn data(&self) -> &Data {
         &self.data
     }
 }
 
-impl From<String> for Handle {
-    fn from(path: String) -> Handle {
-        Handle::from_path(path)
-    }
-}
-
-impl From<&str> for Handle {
-    fn from(path: &str) -> Handle {
-        Handle::from_path(path)
+impl<T> From<T> for Handle
+where
+    T: Into<PathBuf>,
+{
+    fn from(path: T) -> Handle {
+        Handle::from_path(path.into())
     }
 }
 
@@ -194,8 +182,6 @@ impl Hash for Handle {
 }
 
 /// The data of an [`Image`].
-///
-/// [`Image`]: struct.Image.html
 #[derive(Clone, Hash)]
 pub enum Data {
     /// File data
@@ -232,17 +218,12 @@ impl std::fmt::Debug for Data {
 /// Your [renderer] will need to implement this trait before being able to use
 /// an [`Image`] in your user interface.
 ///
-/// [`Image`]: struct.Image.html
-/// [renderer]: ../../renderer/index.html
+/// [renderer]: crate::renderer
 pub trait Renderer: crate::Renderer {
     /// Returns the dimensions of an [`Image`] located on the given path.
-    ///
-    /// [`Image`]: struct.Image.html
     fn dimensions(&self, handle: &Handle) -> (u32, u32);
 
     /// Draws an [`Image`].
-    ///
-    /// [`Image`]: struct.Image.html
     fn draw(&mut self, handle: Handle, layout: Layout<'_>) -> Self::Output;
 }