diff options
Diffstat (limited to '')
| -rw-r--r-- | widget/src/image.rs | 11 | ||||
| -rw-r--r-- | widget/src/image/viewer.rs | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/widget/src/image.rs b/widget/src/image.rs index e906ac13..ccf1f175 100644 --- a/widget/src/image.rs +++ b/widget/src/image.rs @@ -159,7 +159,8 @@ pub fn draw<Renderer, Handle>( } } -impl<Message, Renderer, Handle> Widget<Message, Renderer> for Image<Handle> +impl<Message, Theme, Renderer, Handle> Widget<Message, Theme, Renderer> + for Image<Handle> where Renderer: image::Renderer<Handle = Handle>, Handle: Clone + Hash, @@ -191,7 +192,7 @@ where &self, _state: &Tree, renderer: &mut Renderer, - _theme: &Renderer::Theme, + _theme: &Theme, _style: &renderer::Style, layout: Layout<'_>, _cursor: mouse::Cursor, @@ -207,13 +208,13 @@ where } } -impl<'a, Message, Renderer, Handle> From<Image<Handle>> - for Element<'a, Message, Renderer> +impl<'a, Message, Theme, Renderer, Handle> From<Image<Handle>> + for Element<'a, Message, Theme, Renderer> where Renderer: image::Renderer<Handle = Handle>, Handle: Clone + Hash + 'a, { - fn from(image: Image<Handle>) -> Element<'a, Message, Renderer> { + fn from(image: Image<Handle>) -> Element<'a, Message, Theme, Renderer> { Element::new(image) } } diff --git a/widget/src/image/viewer.rs b/widget/src/image/viewer.rs index 98080577..9666ff9f 100644 --- a/widget/src/image/viewer.rs +++ b/widget/src/image/viewer.rs @@ -84,7 +84,8 @@ impl<Handle> Viewer<Handle> { } } -impl<Message, Renderer, Handle> Widget<Message, Renderer> for Viewer<Handle> +impl<Message, Theme, Renderer, Handle> Widget<Message, Theme, Renderer> + for Viewer<Handle> where Renderer: image::Renderer<Handle = Handle>, Handle: Clone + Hash, @@ -305,7 +306,7 @@ where &self, tree: &Tree, renderer: &mut Renderer, - _theme: &Renderer::Theme, + _theme: &Theme, _style: &renderer::Style, layout: Layout<'_>, _cursor: mouse::Cursor, @@ -390,14 +391,14 @@ impl State { } } -impl<'a, Message, Renderer, Handle> From<Viewer<Handle>> - for Element<'a, Message, Renderer> +impl<'a, Message, Theme, Renderer, Handle> From<Viewer<Handle>> + for Element<'a, Message, Theme, Renderer> where Renderer: 'a + image::Renderer<Handle = Handle>, Message: 'a, Handle: Clone + Hash + 'a, { - fn from(viewer: Viewer<Handle>) -> Element<'a, Message, Renderer> { + fn from(viewer: Viewer<Handle>) -> Element<'a, Message, Theme, Renderer> { Element::new(viewer) } } |