From 0abb82033eecf41483f89273cf07c0def40989c6 Mon Sep 17 00:00:00 2001 From: Cory Forsstrom Date: Wed, 4 May 2022 11:52:19 -0700 Subject: Fix vertical rule helper --- pure/src/helpers.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pure/src') diff --git a/pure/src/helpers.rs b/pure/src/helpers.rs index 2c4a37be..746b807d 100644 --- a/pure/src/helpers.rs +++ b/pure/src/helpers.rs @@ -202,7 +202,7 @@ pub fn horizontal_rule<'a>(height: u16) -> widget::Rule<'a> { /// /// [`Rule`]: widget::Rule pub fn vertical_rule<'a>(width: u16) -> widget::Rule<'a> { - widget::Rule::horizontal(width) + widget::Rule::vertical(width) } /// Creates a new [`ProgressBar`]. -- cgit From 927e1a99d28ef4dc89f9df0f9e56ee40607d739b Mon Sep 17 00:00:00 2001 From: Cory Forsstrom Date: Thu, 5 May 2022 08:56:24 -0700 Subject: Expose pure flex module as public --- pure/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pure/src') diff --git a/pure/src/lib.rs b/pure/src/lib.rs index 6af74771..fa5fd46f 100644 --- a/pure/src/lib.rs +++ b/pure/src/lib.rs @@ -87,12 +87,11 @@ #![forbid(unsafe_code)] #![forbid(rust_2018_idioms)] +pub mod flex; pub mod helpers; pub mod overlay; pub mod widget; -pub(crate) mod flex; - mod element; pub use element::Element; -- cgit From f1c1d519c5be7f9f0bbd32b22635659a803425e2 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 6 May 2022 19:42:14 +0200 Subject: Take `AsRef` instead of `Element` in `Tree` API --- pure/src/element.rs | 8 ++++++++ pure/src/widget/tree.rs | 32 +++++++++++++++++++------------- 2 files changed, 27 insertions(+), 13 deletions(-) (limited to 'pure/src') diff --git a/pure/src/element.rs b/pure/src/element.rs index 704b3d0b..5b5038c8 100644 --- a/pure/src/element.rs +++ b/pure/src/element.rs @@ -321,3 +321,11 @@ where .map(move |overlay| overlay.map(mapper)) } } + +impl<'a, Message, Renderer> AsRef + 'a> + for Element<'a, Message, Renderer> +{ + fn as_ref(&self) -> &(dyn Widget + 'a) { + self.widget.as_ref() + } +} diff --git a/pure/src/widget/tree.rs b/pure/src/widget/tree.rs index d81dd02c..28249fe6 100644 --- a/pure/src/widget/tree.rs +++ b/pure/src/widget/tree.rs @@ -1,5 +1,5 @@ //! Store internal widget state in a state tree to ensure continuity. -use crate::Element; +use crate::Widget; use std::any::{self, Any}; @@ -28,13 +28,15 @@ impl Tree { } /// Creates a new [`Tree`] for the provided [`Element`]. - pub fn new( - element: &Element<'_, Message, Renderer>, + pub fn new<'a, Message, Renderer>( + widget: impl AsRef + 'a>, ) -> Self { + let widget = widget.as_ref(); + Self { - tag: element.as_widget().tag(), - state: element.as_widget().state(), - children: element.as_widget().children(), + tag: widget.tag(), + state: widget.state(), + children: widget.children(), } } @@ -46,23 +48,27 @@ impl Tree { /// Otherwise, the whole [`Tree`] is recreated. /// /// [`Widget::diff`]: crate::Widget::diff - pub fn diff( + pub fn diff<'a, Message, Renderer>( &mut self, - new: &Element<'_, Message, Renderer>, + new: impl AsRef + 'a>, ) { - if self.tag == new.as_widget().tag() { - new.as_widget().diff(self) + if self.tag == new.as_ref().tag() { + new.as_ref().diff(self) } else { *self = Self::new(new); } } /// Reconciliates the children of the tree with the provided list of [`Element`]. - pub fn diff_children( + pub fn diff_children<'a, Message, Renderer>( &mut self, - new_children: &[Element<'_, Message, Renderer>], + new_children: &[impl AsRef + 'a>], ) { - self.diff_children_custom(new_children, Self::diff, Self::new) + self.diff_children_custom( + new_children, + |tree, widget| Self::diff(tree, widget), + |widget| Self::new(widget), + ) } /// Reconciliates the children of the tree with the provided list of [`Element`] using custom -- cgit From 59aeb20600661e55e59223a309146eea68b4c32f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 6 May 2022 23:35:13 +0200 Subject: Use `Borrow` instead of `AsRef` to allow easier casting --- pure/src/element.rs | 16 +++++++++++++--- pure/src/widget/tree.rs | 17 +++++++++-------- 2 files changed, 22 insertions(+), 11 deletions(-) (limited to 'pure/src') diff --git a/pure/src/element.rs b/pure/src/element.rs index 5b5038c8..5450db20 100644 --- a/pure/src/element.rs +++ b/pure/src/element.rs @@ -8,6 +8,8 @@ use iced_native::mouse; use iced_native::renderer; use iced_native::{Clipboard, Length, Point, Rectangle, Shell}; +use std::borrow::Borrow; + /// A generic [`Widget`]. /// /// It is useful to build composable user interfaces that do not leak @@ -322,10 +324,18 @@ where } } -impl<'a, Message, Renderer> AsRef + 'a> +impl<'a, Message, Renderer> Borrow + 'a> for Element<'a, Message, Renderer> { - fn as_ref(&self) -> &(dyn Widget + 'a) { - self.widget.as_ref() + fn borrow(&self) -> &(dyn Widget + 'a) { + self.widget.borrow() + } +} + +impl<'a, Message, Renderer> Borrow + 'a> + for &Element<'a, Message, Renderer> +{ + fn borrow(&self) -> &(dyn Widget + 'a) { + self.widget.borrow() } } diff --git a/pure/src/widget/tree.rs b/pure/src/widget/tree.rs index 28249fe6..0bb3107a 100644 --- a/pure/src/widget/tree.rs +++ b/pure/src/widget/tree.rs @@ -2,6 +2,7 @@ use crate::Widget; use std::any::{self, Any}; +use std::borrow::Borrow; /// A persistent state widget tree. /// @@ -29,9 +30,9 @@ impl Tree { /// Creates a new [`Tree`] for the provided [`Element`]. pub fn new<'a, Message, Renderer>( - widget: impl AsRef + 'a>, + widget: impl Borrow + 'a>, ) -> Self { - let widget = widget.as_ref(); + let widget = widget.borrow(); Self { tag: widget.tag(), @@ -50,10 +51,10 @@ impl Tree { /// [`Widget::diff`]: crate::Widget::diff pub fn diff<'a, Message, Renderer>( &mut self, - new: impl AsRef + 'a>, + new: impl Borrow + 'a>, ) { - if self.tag == new.as_ref().tag() { - new.as_ref().diff(self) + if self.tag == new.borrow().tag() { + new.borrow().diff(self) } else { *self = Self::new(new); } @@ -62,12 +63,12 @@ impl Tree { /// Reconciliates the children of the tree with the provided list of [`Element`]. pub fn diff_children<'a, Message, Renderer>( &mut self, - new_children: &[impl AsRef + 'a>], + new_children: &[impl Borrow + 'a>], ) { self.diff_children_custom( new_children, - |tree, widget| Self::diff(tree, widget), - |widget| Self::new(widget), + |tree, widget| tree.diff(widget.borrow()), + |widget| Self::new(widget.borrow()), ) } -- cgit