From 897188317b5875cc00a0f1c797790df8ac13687f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 11 Feb 2022 17:50:12 +0700 Subject: Rename `iced_virtual` to `iced_pure` `virtual` is a reserved keyword in Rust :grimacing: --- pure/src/lib.rs | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 pure/src/lib.rs (limited to 'pure/src/lib.rs') diff --git a/pure/src/lib.rs b/pure/src/lib.rs new file mode 100644 index 00000000..4381bfc8 --- /dev/null +++ b/pure/src/lib.rs @@ -0,0 +1,146 @@ +pub mod widget; + +pub(crate) mod flex; + +pub use widget::*; + +use iced_native::event::{self, Event}; +use iced_native::layout::{self, Layout}; +use iced_native::mouse; +use iced_native::renderer; +use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell}; + +pub struct Pure<'a, Message, Renderer> { + state: &'a mut State, +} + +impl<'a, Message, Renderer> Pure<'a, Message, Renderer> +where + Message: 'static, + Renderer: iced_native::Renderer + 'static, +{ + pub fn new( + state: &'a mut State, + content: impl Into>, + ) -> Self { + let _ = state.diff(content.into()); + + Self { state } + } +} + +pub struct State { + state_tree: widget::Tree, + last_element: Element, +} + +impl State +where + Message: 'static, + Renderer: iced_native::Renderer + 'static, +{ + pub fn new() -> Self { + let last_element = Element::new(widget::Column::new()); + + Self { + state_tree: widget::Tree::new(&last_element), + last_element, + } + } + + fn diff(&mut self, new_element: Element) { + self.state_tree.diff(&self.last_element, &new_element); + + self.last_element = new_element; + } +} + +impl<'a, Message, Renderer> iced_native::Widget + for Pure<'a, Message, Renderer> +where + Renderer: iced_native::Renderer, +{ + fn width(&self) -> Length { + self.state.last_element.as_widget().width() + } + + fn height(&self) -> Length { + self.state.last_element.as_widget().height() + } + + fn hash_layout(&self, state: &mut Hasher) { + self.state.last_element.as_widget().hash_layout(state) + } + + fn layout( + &self, + renderer: &Renderer, + limits: &layout::Limits, + ) -> layout::Node { + self.state.last_element.as_widget().layout(renderer, limits) + } + + fn on_event( + &mut self, + event: Event, + layout: Layout<'_>, + cursor_position: Point, + renderer: &Renderer, + clipboard: &mut dyn Clipboard, + shell: &mut Shell<'_, Message>, + ) -> event::Status { + self.state.last_element.as_widget_mut().on_event( + &mut self.state.state_tree, + event, + layout, + cursor_position, + renderer, + clipboard, + shell, + ) + } + + fn draw( + &self, + renderer: &mut Renderer, + style: &renderer::Style, + layout: Layout<'_>, + cursor_position: Point, + viewport: &Rectangle, + ) { + self.state.last_element.as_widget().draw( + &self.state.state_tree, + renderer, + style, + layout, + cursor_position, + viewport, + ) + } + + fn mouse_interaction( + &self, + layout: Layout<'_>, + cursor_position: Point, + viewport: &Rectangle, + renderer: &Renderer, + ) -> mouse::Interaction { + self.state.last_element.as_widget().mouse_interaction( + &self.state.state_tree, + layout, + cursor_position, + viewport, + renderer, + ) + } +} + +impl<'a, Message, Renderer> Into> + for Pure<'a, Message, Renderer> +where + Renderer: iced_native::Renderer, +{ + fn into(self) -> iced_native::Element<'a, Message, Renderer> { + iced_native::Element::new(self) + } +} -- cgit From 01c5004959c9b11f2580840f4553ad7d706f4564 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 11 Feb 2022 22:07:21 +0700 Subject: Allow pure widgets to borrow from `Application` data :tada: --- pure/src/lib.rs | 54 +++++++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) (limited to 'pure/src/lib.rs') diff --git a/pure/src/lib.rs b/pure/src/lib.rs index 4381bfc8..a179a84b 100644 --- a/pure/src/lib.rs +++ b/pure/src/lib.rs @@ -11,7 +11,8 @@ use iced_native::renderer; use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell}; pub struct Pure<'a, Message, Renderer> { - state: &'a mut State, + state: &'a mut State, + element: Element<'a, Message, Renderer>, } impl<'a, Message, Renderer> Pure<'a, Message, Renderer> @@ -20,38 +21,32 @@ where Renderer: iced_native::Renderer + 'static, { pub fn new( - state: &'a mut State, - content: impl Into>, + state: &'a mut State, + content: impl Into>, ) -> Self { - let _ = state.diff(content.into()); + let element = content.into(); + let _ = state.diff(&element); - Self { state } + Self { state, element } } } -pub struct State { - state_tree: widget::Tree, - last_element: Element, +pub struct State { + state_tree: widget::Tree, } -impl State -where - Message: 'static, - Renderer: iced_native::Renderer + 'static, -{ +impl State { pub fn new() -> Self { - let last_element = Element::new(widget::Column::new()); - Self { - state_tree: widget::Tree::new(&last_element), - last_element, + state_tree: widget::Tree::empty(), } } - fn diff(&mut self, new_element: Element) { - self.state_tree.diff(&self.last_element, &new_element); - - self.last_element = new_element; + fn diff( + &mut self, + new_element: &Element, + ) { + self.state_tree.diff(new_element); } } @@ -61,15 +56,15 @@ where Renderer: iced_native::Renderer, { fn width(&self) -> Length { - self.state.last_element.as_widget().width() + self.element.as_widget().width() } fn height(&self) -> Length { - self.state.last_element.as_widget().height() + self.element.as_widget().height() } fn hash_layout(&self, state: &mut Hasher) { - self.state.last_element.as_widget().hash_layout(state) + self.element.as_widget().hash_layout(state) } fn layout( @@ -77,7 +72,7 @@ where renderer: &Renderer, limits: &layout::Limits, ) -> layout::Node { - self.state.last_element.as_widget().layout(renderer, limits) + self.element.as_widget().layout(renderer, limits) } fn on_event( @@ -89,7 +84,7 @@ where clipboard: &mut dyn Clipboard, shell: &mut Shell<'_, Message>, ) -> event::Status { - self.state.last_element.as_widget_mut().on_event( + self.element.as_widget_mut().on_event( &mut self.state.state_tree, event, layout, @@ -108,7 +103,7 @@ where cursor_position: Point, viewport: &Rectangle, ) { - self.state.last_element.as_widget().draw( + self.element.as_widget().draw( &self.state.state_tree, renderer, style, @@ -125,7 +120,7 @@ where viewport: &Rectangle, renderer: &Renderer, ) -> mouse::Interaction { - self.state.last_element.as_widget().mouse_interaction( + self.element.as_widget().mouse_interaction( &self.state.state_tree, layout, cursor_position, @@ -138,7 +133,8 @@ where impl<'a, Message, Renderer> Into> for Pure<'a, Message, Renderer> where - Renderer: iced_native::Renderer, + Message: 'a, + Renderer: iced_native::Renderer + 'a, { fn into(self) -> iced_native::Element<'a, Message, Renderer> { iced_native::Element::new(self) -- cgit From bd22cc0bc0f7551d29cf2acd22520f4a906f253c Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 12 Feb 2022 17:21:28 +0700 Subject: Implement pure version of `todos` example :tada: The `Widget` trait in `iced_pure` needed to change a bit to make the implementation of `Element::map` possible. Specifically, the `children` method has been split into `diff` and `children_state`. --- pure/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pure/src/lib.rs') diff --git a/pure/src/lib.rs b/pure/src/lib.rs index a179a84b..07f068cc 100644 --- a/pure/src/lib.rs +++ b/pure/src/lib.rs @@ -53,7 +53,8 @@ impl State { impl<'a, Message, Renderer> iced_native::Widget for Pure<'a, Message, Renderer> where - Renderer: iced_native::Renderer, + Message: 'a, + Renderer: iced_native::Renderer + 'a, { fn width(&self) -> Length { self.element.as_widget().width() -- cgit From 019af8ddbf96680ffcee2b3407819e90575760cb Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 16 Feb 2022 17:07:25 +0700 Subject: Add `overlay` support in `iced_pure` and port `PickList` :tada: --- pure/src/lib.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'pure/src/lib.rs') diff --git a/pure/src/lib.rs b/pure/src/lib.rs index 07f068cc..bab3bbc7 100644 --- a/pure/src/lib.rs +++ b/pure/src/lib.rs @@ -1,3 +1,4 @@ +pub mod overlay; pub mod widget; pub(crate) mod flex; @@ -129,6 +130,18 @@ where renderer, ) } + + fn overlay( + &mut self, + layout: Layout<'_>, + renderer: &Renderer, + ) -> Option> { + self.element.as_widget_mut().overlay( + &mut self.state.state_tree, + layout, + renderer, + ) + } } impl<'a, Message, Renderer> Into> -- cgit From d7100fd2597da82d97eaf196d50573ea64f3f8ff Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 16 Mar 2022 17:37:19 +0700 Subject: Export widget modules in `iced_pure` ... and fix collisions with the new `helpers` --- pure/src/lib.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pure/src/lib.rs') diff --git a/pure/src/lib.rs b/pure/src/lib.rs index 1b51d55b..ec2f29f8 100644 --- a/pure/src/lib.rs +++ b/pure/src/lib.rs @@ -1,9 +1,14 @@ +pub mod helpers; pub mod overlay; pub mod widget; pub(crate) mod flex; -pub use widget::*; +mod element; + +pub use element::Element; +pub use helpers::*; +pub use widget::Widget; use iced_native::event::{self, Event}; use iced_native::layout::{self, Layout}; -- cgit