me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove generic handle in Image

Browse source 
For now, we will simply assume images will be loaded from a given path.
This commit is contained in:
Héctor Ramón Jiménez 2019-10-22 23:20:24 +02:00
parent 523736f08b
commit f8a232c8af
4 changed files with 25 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

18
native/src/widget/image.rs
View file

@ -6,10 +6,9 @@ use std::hash::Hash;
pub use iced_core::Image;
impl<I, Message, Renderer> Widget<Message, Renderer> for Image<I>
impl<Message, Renderer> Widget<Message, Renderer> for Image
where
Renderer: self::Renderer<I>,
I: Clone,
Renderer: self::Renderer,
{
fn node(&self, renderer: &Renderer) -> Node {
renderer.node(&self)
@ -38,27 +37,26 @@ where
///
/// [`Image`]: struct.Image.html
/// [renderer]: ../../renderer/index.html
pub trait Renderer<I>: crate::Renderer {
pub trait Renderer: crate::Renderer {
/// Creates a [`Node`] for the provided [`Image`].
///
/// You should probably keep the original aspect ratio, if possible.
///
/// [`Node`]: ../../struct.Node.html
/// [`Image`]: struct.Image.html
fn node(&self, image: &Image<I>) -> Node;
fn node(&self, image: &Image) -> Node;
/// Draws an [`Image`].
///
/// [`Image`]: struct.Image.html
fn draw(&mut self, image: &Image<I>, layout: Layout<'_>) -> Self::Output;
fn draw(&mut self, image: &Image, layout: Layout<'_>) -> Self::Output;
}
impl<'a, I, Message, Renderer> From<Image<I>> for Element<'a, Message, Renderer>
impl<'a, Message, Renderer> From<Image> for Element<'a, Message, Renderer>
where
Renderer: self::Renderer<I>,
I: Clone + 'a,
Renderer: self::Renderer,
{
fn from(image: Image<I>) -> Element<'a, Message, Renderer> {
fn from(image: Image) -> Element<'a, Message, Renderer> {
Element::new(image)
}
}