diff options
author | 2023-02-17 11:45:34 -0800 | |
---|---|---|
committer | 2023-02-17 11:45:34 -0800 | |
commit | 744cef5608a91fe55cbbe1adb73a9a0b5e266668 (patch) | |
tree | f88ca6ae3c481e2de74178bb3f0d1f1b685e1740 /native/src/widget/image.rs | |
parent | 8da098330b58542cc929f4f24d02e26bd654bae4 (diff) | |
parent | 7dc1fb488ddbd12519571b51d75ae0c28875911d (diff) | |
download | iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.tar.gz iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.tar.bz2 iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.zip |
Merge remote-tracking branch 'origin/master' into feat/multi-window-support
# Conflicts:
# winit/src/window.rs
Diffstat (limited to 'native/src/widget/image.rs')
-rw-r--r-- | native/src/widget/image.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs index 3ff06a76..73257a74 100644 --- a/native/src/widget/image.rs +++ b/native/src/widget/image.rs @@ -29,7 +29,7 @@ pub fn viewer<Handle>(handle: Handle) -> Viewer<Handle> { /// ``` /// /// <img src="https://github.com/iced-rs/iced/blob/9712b319bb7a32848001b96bd84977430f14b623/examples/resources/ferris.png?raw=true" width="300"> -#[derive(Debug, Hash)] +#[derive(Debug)] pub struct Image<Handle> { handle: Handle, width: Length, @@ -49,14 +49,14 @@ impl<Handle> Image<Handle> { } /// Sets the width of the [`Image`] boundaries. - pub fn width(mut self, width: Length) -> Self { - self.width = width; + pub fn width(mut self, width: impl Into<Length>) -> Self { + self.width = width.into(); self } /// Sets the height of the [`Image`] boundaries. - pub fn height(mut self, height: Length) -> Self { - self.height = height; + pub fn height(mut self, height: impl Into<Length>) -> Self { + self.height = height.into(); self } |