diff options
Diffstat (limited to 'native/src/element.rs')
| -rw-r--r-- | native/src/element.rs | 267 |
1 files changed, 158 insertions, 109 deletions
diff --git a/native/src/element.rs b/native/src/element.rs index 119b7892..074e422e 100644 --- a/native/src/element.rs +++ b/native/src/element.rs @@ -3,10 +3,14 @@ use crate::layout; use crate::mouse; use crate::overlay; use crate::renderer; +use crate::widget; +use crate::widget::tree::{self, Tree}; use crate::{ Clipboard, Color, Layout, Length, Point, Rectangle, Shell, Widget, }; +use std::borrow::Borrow; + /// A generic [`Widget`]. /// /// It is useful to build composable user interfaces that do not leak @@ -15,25 +19,33 @@ use crate::{ /// If you have a [built-in widget], you should be able to use `Into<Element>` /// to turn it into an [`Element`]. /// -/// [built-in widget]: widget/index.html#built-in-widgets +/// [built-in widget]: crate::widget #[allow(missing_debug_implementations)] pub struct Element<'a, Message, Renderer> { - pub(crate) widget: Box<dyn Widget<Message, Renderer> + 'a>, + widget: Box<dyn Widget<Message, Renderer> + 'a>, } -impl<'a, Message, Renderer> Element<'a, Message, Renderer> -where - Renderer: crate::Renderer, -{ +impl<'a, Message, Renderer> Element<'a, Message, Renderer> { /// Creates a new [`Element`] containing the given [`Widget`]. - pub fn new( - widget: impl Widget<Message, Renderer> + 'a, - ) -> Element<'a, Message, Renderer> { - Element { + pub fn new(widget: impl Widget<Message, Renderer> + 'a) -> Self + where + Renderer: crate::Renderer, + { + Self { widget: Box::new(widget), } } + /// Returns a reference to the [`Widget`] of the [`Element`], + pub fn as_widget(&self) -> &dyn Widget<Message, Renderer> { + self.widget.as_ref() + } + + /// Returns a mutable reference to the [`Widget`] of the [`Element`], + pub fn as_widget_mut(&mut self) -> &mut dyn Widget<Message, Renderer> { + self.widget.as_mut() + } + /// Applies a transformation to the produced message of the [`Element`]. /// /// This method is useful when you want to decouple different parts of your @@ -79,7 +91,7 @@ where /// /// ``` /// # mod counter { - /// # type Text = iced_native::widget::Text<iced_native::renderer::Null>; + /// # type Text<'a> = iced_native::widget::Text<'a, iced_native::renderer::Null>; /// # /// # #[derive(Debug, Clone, Copy)] /// # pub enum Message {} @@ -168,16 +180,16 @@ where /// } /// } /// ``` - pub fn map<F, B>(self, f: F) -> Element<'a, B, Renderer> + pub fn map<B>( + self, + f: impl Fn(Message) -> B + 'a, + ) -> Element<'a, B, Renderer> where - Message: 'static, - Renderer: 'a, - B: 'static, - F: 'static + Fn(Message) -> B, + Message: 'a, + Renderer: crate::Renderer + 'a, + B: 'a, { - Element { - widget: Box::new(Map::new(self.widget, f)), - } + Element::new(Map::new(self.widget, f)) } /// Marks the [`Element`] as _to-be-explained_. @@ -192,96 +204,33 @@ where ) -> Element<'a, Message, Renderer> where Message: 'static, - Renderer: 'a, + Renderer: crate::Renderer + 'a, { Element { widget: Box::new(Explain::new(self, color.into())), } } +} - /// Returns the width of the [`Element`]. - pub fn width(&self) -> Length { - self.widget.width() - } - - /// Returns the height of the [`Element`]. - pub fn height(&self) -> Length { - self.widget.height() - } - - /// Computes the layout of the [`Element`] in the given [`Limits`]. - /// - /// [`Limits`]: layout::Limits - pub fn layout( - &self, - renderer: &Renderer, - limits: &layout::Limits, - ) -> layout::Node { - self.widget.layout(renderer, limits) - } - - /// Processes a runtime [`Event`]. - pub 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.widget.on_event( - event, - layout, - cursor_position, - renderer, - clipboard, - shell, - ) - } - - /// Draws the [`Element`] and its children using the given [`Layout`]. - pub fn draw( - &self, - renderer: &mut Renderer, - style: &renderer::Style, - layout: Layout<'_>, - cursor_position: Point, - viewport: &Rectangle, - ) { - self.widget - .draw(renderer, style, layout, cursor_position, viewport) - } - - /// Returns the current [`mouse::Interaction`] of the [`Element`]. - pub fn mouse_interaction( - &self, - layout: Layout<'_>, - cursor_position: Point, - viewport: &Rectangle, - renderer: &Renderer, - ) -> mouse::Interaction { - self.widget.mouse_interaction( - layout, - cursor_position, - viewport, - renderer, - ) +impl<'a, Message, Renderer> Borrow<dyn Widget<Message, Renderer> + 'a> + for Element<'a, Message, Renderer> +{ + fn borrow(&self) -> &(dyn Widget<Message, Renderer> + 'a) { + self.widget.borrow() } +} - /// Returns the overlay of the [`Element`], if there is any. - pub fn overlay<'b>( - &'b mut self, - layout: Layout<'_>, - renderer: &Renderer, - ) -> Option<overlay::Element<'b, Message, Renderer>> { - self.widget.overlay(layout, renderer) +impl<'a, Message, Renderer> Borrow<dyn Widget<Message, Renderer> + 'a> + for &Element<'a, Message, Renderer> +{ + fn borrow(&self) -> &(dyn Widget<Message, Renderer> + 'a) { + self.widget.borrow() } } struct Map<'a, A, B, Renderer> { widget: Box<dyn Widget<A, Renderer> + 'a>, - mapper: Box<dyn Fn(A) -> B>, + mapper: Box<dyn Fn(A) -> B + 'a>, } impl<'a, A, B, Renderer> Map<'a, A, B, Renderer> { @@ -290,7 +239,7 @@ impl<'a, A, B, Renderer> Map<'a, A, B, Renderer> { mapper: F, ) -> Map<'a, A, B, Renderer> where - F: 'static + Fn(A) -> B, + F: 'a + Fn(A) -> B, { Map { widget, @@ -302,9 +251,25 @@ impl<'a, A, B, Renderer> Map<'a, A, B, Renderer> { impl<'a, A, B, Renderer> Widget<B, Renderer> for Map<'a, A, B, Renderer> where Renderer: crate::Renderer + 'a, - A: 'static, - B: 'static, + A: 'a, + B: 'a, { + fn tag(&self) -> tree::Tag { + self.widget.tag() + } + + fn state(&self) -> tree::State { + self.widget.state() + } + + fn children(&self) -> Vec<Tree> { + self.widget.children() + } + + fn diff(&self, tree: &mut Tree) { + self.widget.diff(tree) + } + fn width(&self) -> Length { self.widget.width() } @@ -321,8 +286,45 @@ where self.widget.layout(renderer, limits) } + fn operate( + &self, + tree: &mut Tree, + layout: Layout<'_>, + operation: &mut dyn widget::Operation<B>, + ) { + struct MapOperation<'a, B> { + operation: &'a mut dyn widget::Operation<B>, + } + + impl<'a, T, B> widget::Operation<T> for MapOperation<'a, B> { + fn container( + &mut self, + id: Option<&widget::Id>, + operate_on_children: &mut dyn FnMut( + &mut dyn widget::Operation<T>, + ), + ) { + self.operation.container(id, &mut |operation| { + operate_on_children(&mut MapOperation { operation }); + }); + } + + fn focusable( + &mut self, + state: &mut dyn widget::operation::Focusable, + id: Option<&widget::Id>, + ) { + self.operation.focusable(state, id); + } + } + + self.widget + .operate(tree, layout, &mut MapOperation { operation }); + } + fn on_event( &mut self, + tree: &mut Tree, event: Event, layout: Layout<'_>, cursor_position: Point, @@ -334,6 +336,7 @@ where let mut local_shell = Shell::new(&mut local_messages); let status = self.widget.on_event( + tree, event, layout, cursor_position, @@ -349,24 +352,35 @@ where fn draw( &self, + tree: &Tree, renderer: &mut Renderer, + theme: &Renderer::Theme, style: &renderer::Style, layout: Layout<'_>, cursor_position: Point, viewport: &Rectangle, ) { - self.widget - .draw(renderer, style, layout, cursor_position, viewport) + self.widget.draw( + tree, + renderer, + theme, + style, + layout, + cursor_position, + viewport, + ) } fn mouse_interaction( &self, + tree: &Tree, layout: Layout<'_>, cursor_position: Point, viewport: &Rectangle, renderer: &Renderer, ) -> mouse::Interaction { self.widget.mouse_interaction( + tree, layout, cursor_position, viewport, @@ -374,15 +388,16 @@ where ) } - fn overlay( - &mut self, + fn overlay<'b>( + &'b self, + tree: &'b mut Tree, layout: Layout<'_>, renderer: &Renderer, - ) -> Option<overlay::Element<'_, B, Renderer>> { + ) -> Option<overlay::Element<'b, B, Renderer>> { let mapper = &self.mapper; self.widget - .overlay(layout, renderer) + .overlay(tree, layout, renderer) .map(move |overlay| overlay.map(mapper)) } } @@ -414,6 +429,22 @@ where self.element.widget.height() } + fn tag(&self) -> tree::Tag { + self.element.widget.tag() + } + + fn state(&self) -> tree::State { + self.element.widget.state() + } + + fn children(&self) -> Vec<Tree> { + self.element.widget.children() + } + + fn diff(&self, tree: &mut Tree) { + self.element.widget.diff(tree); + } + fn layout( &self, renderer: &Renderer, @@ -422,8 +453,18 @@ where self.element.widget.layout(renderer, limits) } + fn operate( + &self, + state: &mut Tree, + layout: Layout<'_>, + operation: &mut dyn widget::Operation<Message>, + ) { + self.element.widget.operate(state, layout, operation) + } + fn on_event( &mut self, + state: &mut Tree, event: Event, layout: Layout<'_>, cursor_position: Point, @@ -432,6 +473,7 @@ where shell: &mut Shell<'_, Message>, ) -> event::Status { self.element.widget.on_event( + state, event, layout, cursor_position, @@ -443,7 +485,9 @@ where fn draw( &self, + state: &Tree, renderer: &mut Renderer, + theme: &Renderer::Theme, style: &renderer::Style, layout: Layout<'_>, cursor_position: Point, @@ -470,7 +514,9 @@ where } self.element.widget.draw( + state, renderer, + theme, style, layout, cursor_position, @@ -482,12 +528,14 @@ where fn mouse_interaction( &self, + state: &Tree, layout: Layout<'_>, cursor_position: Point, viewport: &Rectangle, renderer: &Renderer, ) -> mouse::Interaction { self.element.widget.mouse_interaction( + state, layout, cursor_position, viewport, @@ -495,11 +543,12 @@ where ) } - fn overlay( - &mut self, + fn overlay<'b>( + &'b self, + state: &'b mut Tree, layout: Layout<'_>, renderer: &Renderer, - ) -> Option<overlay::Element<'_, Message, Renderer>> { - self.element.overlay(layout, renderer) + ) -> Option<overlay::Element<'b, Message, Renderer>> { + self.element.widget.overlay(state, layout, renderer) } } |