From 45455be45000c0d41d18eced1b62eab049c5e9c0 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 13 Feb 2022 16:51:31 +0700 Subject: Implement `Image` in `iced_pure` --- pure/src/widget/image.rs | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pure/src/widget/image.rs (limited to 'pure/src/widget/image.rs') diff --git a/pure/src/widget/image.rs b/pure/src/widget/image.rs new file mode 100644 index 00000000..b33dad2b --- /dev/null +++ b/pure/src/widget/image.rs @@ -0,0 +1,74 @@ +use crate::widget::{Tree, Widget}; + +use iced_native::layout::{self, Layout}; +use iced_native::renderer; +use iced_native::widget::image; +use iced_native::{Hasher, Length, Point, Rectangle}; + +use std::any::{self, Any}; +use std::hash::Hash; + +pub use image::Image; + +impl Widget for Image +where + Handle: Clone + Hash, + Renderer: iced_native::image::Renderer, +{ + fn tag(&self) -> any::TypeId { + any::TypeId::of::<()>() + } + + fn state(&self) -> Box { + Box::new(()) + } + + fn children_state(&self) -> Vec { + Vec::new() + } + + fn diff(&self, _tree: &mut Tree) {} + + fn width(&self) -> Length { + >::width(self) + } + + fn height(&self) -> Length { + >::height(self) + } + + fn layout( + &self, + renderer: &Renderer, + limits: &layout::Limits, + ) -> layout::Node { + >::layout( + self, renderer, limits, + ) + } + + fn draw( + &self, + _tree: &Tree, + renderer: &mut Renderer, + style: &renderer::Style, + layout: Layout<'_>, + cursor_position: Point, + viewport: &Rectangle, + ) { + >::draw( + self, + renderer, + style, + layout, + cursor_position, + viewport, + ) + } + + fn hash_layout(&self, state: &mut Hasher) { + >::hash_layout( + self, state, + ) + } +} -- cgit From 0fec0a2b77b6b9447117f2fea81c700a25fbca6d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 13 Feb 2022 19:01:09 +0700 Subject: Implement `Toggler` in `iced_pure` --- pure/src/widget/image.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'pure/src/widget/image.rs') diff --git a/pure/src/widget/image.rs b/pure/src/widget/image.rs index b33dad2b..51a24ed1 100644 --- a/pure/src/widget/image.rs +++ b/pure/src/widget/image.rs @@ -1,4 +1,5 @@ use crate::widget::{Tree, Widget}; +use crate::Element; use iced_native::layout::{self, Layout}; use iced_native::renderer; @@ -72,3 +73,15 @@ where ) } } + +impl<'a, Message, Renderer, Handle> Into> + for Image +where + Message: Clone + 'a, + Renderer: iced_native::image::Renderer + 'a, + Handle: Clone + Hash + 'a, +{ + fn into(self) -> Element<'a, Message, Renderer> { + Element::new(self) + } +} -- cgit From 35e9b75e415ef3b9124051696b60628ef56afe47 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 16 Feb 2022 15:44:50 +0700 Subject: Introduce `Tag` and `State` opaque types in `iced_pure::widget::tree` --- pure/src/widget/image.rs | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'pure/src/widget/image.rs') diff --git a/pure/src/widget/image.rs b/pure/src/widget/image.rs index 51a24ed1..ce807813 100644 --- a/pure/src/widget/image.rs +++ b/pure/src/widget/image.rs @@ -6,7 +6,6 @@ use iced_native::renderer; use iced_native::widget::image; use iced_native::{Hasher, Length, Point, Rectangle}; -use std::any::{self, Any}; use std::hash::Hash; pub use image::Image; @@ -16,20 +15,6 @@ where Handle: Clone + Hash, Renderer: iced_native::image::Renderer, { - fn tag(&self) -> any::TypeId { - any::TypeId::of::<()>() - } - - fn state(&self) -> Box { - Box::new(()) - } - - fn children_state(&self) -> Vec { - Vec::new() - } - - fn diff(&self, _tree: &mut Tree) {} - fn width(&self) -> Length { >::width(self) } -- cgit