From 6bbe1898097b9ba13efa6c4eee53e4d5e2f18a48 Mon Sep 17 00:00:00 2001 From: edwloef Date: Tue, 25 Nov 2025 23:58:07 +0100 Subject: [PATCH] Fix inconsistent naming of `tree` parameter in `Widget` trait (#2950) * fix inconsistent naming of tree parameter in widget trait * rename `Tree` parameter in various usages across iced --- core/src/element.rs | 20 +++++++-------- core/src/widget.rs | 8 +++--- core/src/widget/text.rs | 2 +- examples/custom_quad/src/main.rs | 2 +- examples/custom_widget/src/main.rs | 2 +- examples/loupe/src/main.rs | 2 +- examples/toast/src/main.rs | 40 ++++++++++++++--------------- examples/vectorial_text/src/main.rs | 2 +- widget/src/checkbox.rs | 2 +- widget/src/column.rs | 16 ++++++------ widget/src/float.rs | 12 ++++----- widget/src/grid.rs | 16 ++++++------ widget/src/helpers.rs | 8 +++--- widget/src/image.rs | 2 +- widget/src/keyed/column.rs | 12 ++++----- widget/src/overlay/menu.rs | 16 ++++++------ widget/src/progress_bar.rs | 2 +- widget/src/radio.rs | 4 +-- widget/src/row.rs | 16 ++++++------ widget/src/rule.rs | 2 +- widget/src/space.rs | 2 +- widget/src/stack.rs | 32 +++++++++++------------ widget/src/table.rs | 19 +++++++------- widget/src/text_editor.rs | 2 +- widget/src/text_input.rs | 2 +- widget/src/toggler.rs | 4 +-- widget/src/tooltip.rs | 8 +++--- 27 files changed, 127 insertions(+), 128 deletions(-) diff --git a/core/src/element.rs b/core/src/element.rs index f847b6c2..52cd6f61 100644 --- a/core/src/element.rs +++ b/core/src/element.rs @@ -435,19 +435,19 @@ where fn operate( &mut self, - state: &mut Tree, + tree: &mut Tree, layout: Layout<'_>, renderer: &Renderer, operation: &mut dyn widget::Operation, ) { self.element .widget - .operate(state, layout, renderer, operation); + .operate(tree, layout, renderer, operation); } fn update( &mut self, - state: &mut Tree, + tree: &mut Tree, event: &Event, layout: Layout<'_>, cursor: mouse::Cursor, @@ -457,13 +457,13 @@ where viewport: &Rectangle, ) { self.element.widget.update( - state, event, layout, cursor, renderer, clipboard, shell, viewport, + tree, event, layout, cursor, renderer, clipboard, shell, viewport, ); } fn draw( &self, - state: &Tree, + tree: &Tree, renderer: &mut Renderer, theme: &Theme, style: &renderer::Style, @@ -496,7 +496,7 @@ where self.element .widget - .draw(state, renderer, theme, style, layout, cursor, viewport); + .draw(tree, renderer, theme, style, layout, cursor, viewport); renderer.with_layer(Rectangle::INFINITE, |renderer| { explain_layout(renderer, self.color, layout); @@ -505,7 +505,7 @@ where fn mouse_interaction( &self, - state: &Tree, + tree: &Tree, layout: Layout<'_>, cursor: mouse::Cursor, viewport: &Rectangle, @@ -513,19 +513,19 @@ where ) -> mouse::Interaction { self.element .widget - .mouse_interaction(state, layout, cursor, viewport, renderer) + .mouse_interaction(tree, layout, cursor, viewport, renderer) } fn overlay<'b>( &'b mut self, - state: &'b mut Tree, + tree: &'b mut Tree, layout: Layout<'b>, renderer: &Renderer, viewport: &Rectangle, translation: Vector, ) -> Option> { self.element.widget.overlay( - state, + tree, layout, renderer, viewport, diff --git a/core/src/widget.rs b/core/src/widget.rs index ff34c723..c11dd9eb 100644 --- a/core/src/widget.rs +++ b/core/src/widget.rs @@ -99,7 +99,7 @@ where /// Applies an [`Operation`] to the [`Widget`]. fn operate( &mut self, - _state: &mut Tree, + _tree: &mut Tree, _layout: Layout<'_>, _renderer: &Renderer, _operation: &mut dyn Operation, @@ -111,7 +111,7 @@ where /// By default, it does nothing. fn update( &mut self, - _state: &mut Tree, + _tree: &mut Tree, _event: &Event, _layout: Layout<'_>, _cursor: mouse::Cursor, @@ -127,7 +127,7 @@ where /// By default, it returns [`mouse::Interaction::None`]. fn mouse_interaction( &self, - _state: &Tree, + _tree: &Tree, _layout: Layout<'_>, _cursor: mouse::Cursor, _viewport: &Rectangle, @@ -139,7 +139,7 @@ where /// Returns the overlay of the [`Widget`], if there is any. fn overlay<'a>( &'a mut self, - _state: &'a mut Tree, + _tree: &'a mut Tree, _layout: Layout<'a>, _renderer: &Renderer, _viewport: &Rectangle, diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs index 72cb4319..676d60a3 100644 --- a/core/src/widget/text.rs +++ b/core/src/widget/text.rs @@ -245,7 +245,7 @@ where fn operate( &mut self, - _state: &mut Tree, + _tree: &mut Tree, layout: Layout<'_>, _renderer: &Renderer, operation: &mut dyn super::Operation, diff --git a/examples/custom_quad/src/main.rs b/examples/custom_quad/src/main.rs index 81911669..1d02b64f 100644 --- a/examples/custom_quad/src/main.rs +++ b/examples/custom_quad/src/main.rs @@ -185,7 +185,7 @@ mod quad { fn draw( &self, - _state: &widget::Tree, + _tree: &widget::Tree, renderer: &mut Renderer, _theme: &Theme, _style: &renderer::Style, diff --git a/examples/custom_widget/src/main.rs b/examples/custom_widget/src/main.rs index c44775be..8fe571fb 100644 --- a/examples/custom_widget/src/main.rs +++ b/examples/custom_widget/src/main.rs @@ -43,7 +43,7 @@ mod circle { fn draw( &self, - _state: &widget::Tree, + _tree: &widget::Tree, renderer: &mut Renderer, _theme: &Theme, _style: &renderer::Style, diff --git a/examples/loupe/src/main.rs b/examples/loupe/src/main.rs index 89bc82da..b140d721 100644 --- a/examples/loupe/src/main.rs +++ b/examples/loupe/src/main.rs @@ -146,7 +146,7 @@ mod loupe { fn mouse_interaction( &self, - _state: &widget::Tree, + _tree: &widget::Tree, layout: Layout<'_>, cursor: mouse::Cursor, _viewport: &Rectangle, diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs index 47749e8e..5faaea60 100644 --- a/examples/toast/src/main.rs +++ b/examples/toast/src/main.rs @@ -349,7 +349,7 @@ mod toast { fn operate( &mut self, - state: &mut Tree, + tree: &mut Tree, layout: Layout<'_>, renderer: &Renderer, operation: &mut dyn Operation, @@ -357,7 +357,7 @@ mod toast { operation.container(None, layout.bounds()); operation.traverse(&mut |operation| { self.content.as_widget_mut().operate( - &mut state.children[0], + &mut tree.children[0], layout, renderer, operation, @@ -367,7 +367,7 @@ mod toast { fn update( &mut self, - state: &mut Tree, + tree: &mut Tree, event: &Event, layout: Layout<'_>, cursor: mouse::Cursor, @@ -377,7 +377,7 @@ mod toast { viewport: &Rectangle, ) { self.content.as_widget_mut().update( - &mut state.children[0], + &mut tree.children[0], event, layout, cursor, @@ -390,7 +390,7 @@ mod toast { fn draw( &self, - state: &Tree, + tree: &Tree, renderer: &mut Renderer, theme: &Theme, style: &renderer::Style, @@ -399,7 +399,7 @@ mod toast { viewport: &Rectangle, ) { self.content.as_widget().draw( - &state.children[0], + &tree.children[0], renderer, theme, style, @@ -411,14 +411,14 @@ mod toast { fn mouse_interaction( &self, - state: &Tree, + tree: &Tree, layout: Layout<'_>, cursor: mouse::Cursor, viewport: &Rectangle, renderer: &Renderer, ) -> mouse::Interaction { self.content.as_widget().mouse_interaction( - &state.children[0], + &tree.children[0], layout, cursor, viewport, @@ -428,15 +428,15 @@ mod toast { fn overlay<'b>( &'b mut self, - state: &'b mut Tree, + tree: &'b mut Tree, layout: Layout<'b>, renderer: &Renderer, viewport: &Rectangle, translation: Vector, ) -> Option> { - let instants = state.state.downcast_mut::>>(); + let instants = tree.state.downcast_mut::>>(); - let (content_state, toasts_state) = state.children.split_at_mut(1); + let (content_state, toasts_state) = tree.children.split_at_mut(1); let content = self.content.as_widget_mut().overlay( &mut content_state[0], @@ -451,7 +451,7 @@ mod toast { position: layout.bounds().position() + translation, viewport: *viewport, toasts: &mut self.toasts, - state: toasts_state, + trees: toasts_state, instants, on_close: &self.on_close, timeout_secs: self.timeout_secs, @@ -469,7 +469,7 @@ mod toast { position: Point, viewport: Rectangle, toasts: &'b mut [Element<'a, Message>], - state: &'b mut [Tree], + trees: &'b mut [Tree], instants: &'b mut [Option], on_close: &'b dyn Fn(usize) -> Message, timeout_secs: u64, @@ -495,7 +495,7 @@ mod toast { 10.0, Alignment::End, self.toasts, - self.state, + self.trees, ) .translate(Vector::new(self.position.x, self.position.y)) } @@ -532,7 +532,7 @@ mod toast { for (((child, state), layout), instant) in self .toasts .iter_mut() - .zip(self.state.iter_mut()) + .zip(self.trees.iter_mut()) .zip(layout.children()) .zip(self.instants.iter_mut()) { @@ -568,14 +568,14 @@ mod toast { ) { let viewport = layout.bounds(); - for ((child, state), layout) in self + for ((child, tree), layout) in self .toasts .iter() - .zip(self.state.iter()) + .zip(self.trees.iter()) .zip(layout.children()) { child.as_widget().draw( - state, renderer, theme, style, layout, cursor, &viewport, + tree, renderer, theme, style, layout, cursor, &viewport, ); } } @@ -590,7 +590,7 @@ mod toast { operation.traverse(&mut |operation| { self.toasts .iter_mut() - .zip(self.state.iter_mut()) + .zip(self.trees.iter_mut()) .zip(layout.children()) .for_each(|((child, state), layout)| { child @@ -608,7 +608,7 @@ mod toast { ) -> mouse::Interaction { self.toasts .iter() - .zip(self.state.iter()) + .zip(self.trees.iter()) .zip(layout.children()) .map(|((child, state), layout)| { child diff --git a/examples/vectorial_text/src/main.rs b/examples/vectorial_text/src/main.rs index 7cbaf02a..356a0f06 100644 --- a/examples/vectorial_text/src/main.rs +++ b/examples/vectorial_text/src/main.rs @@ -117,7 +117,7 @@ impl canvas::Program for State { fn draw( &self, - _state: &Self::State, + _tree: &Self::State, renderer: &Renderer, theme: &Theme, bounds: Rectangle, diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs index c15455c8..daaa9e69 100644 --- a/widget/src/checkbox.rs +++ b/widget/src/checkbox.rs @@ -459,7 +459,7 @@ where fn operate( &mut self, - _state: &mut Tree, + _tree: &mut Tree, layout: Layout<'_>, _renderer: &Renderer, operation: &mut dyn widget::Operation, diff --git a/widget/src/column.rs b/widget/src/column.rs index f7efb44b..0db0c74c 100644 --- a/widget/src/column.rs +++ b/widget/src/column.rs @@ -269,14 +269,14 @@ where shell: &mut Shell<'_, Message>, viewport: &Rectangle, ) { - for ((child, state), layout) in self + for ((child, tree), layout) in self .children .iter_mut() .zip(&mut tree.children) .zip(layout.children()) { child.as_widget_mut().update( - state, event, layout, cursor, renderer, clipboard, shell, + tree, event, layout, cursor, renderer, clipboard, shell, viewport, ); } @@ -294,10 +294,10 @@ where .iter() .zip(&tree.children) .zip(layout.children()) - .map(|((child, state), layout)| { - child.as_widget().mouse_interaction( - state, layout, cursor, viewport, renderer, - ) + .map(|((child, tree), layout)| { + child + .as_widget() + .mouse_interaction(tree, layout, cursor, viewport, renderer) }) .max() .unwrap_or_default() @@ -320,7 +320,7 @@ where viewport }; - for ((child, state), layout) in self + for ((child, tree), layout) in self .children .iter() .zip(&tree.children) @@ -328,7 +328,7 @@ where .filter(|(_, layout)| layout.bounds().intersects(viewport)) { child.as_widget().draw( - state, renderer, theme, style, layout, cursor, viewport, + tree, renderer, theme, style, layout, cursor, viewport, ); } } diff --git a/widget/src/float.rs b/widget/src/float.rs index c04adee6..cfd4bed0 100644 --- a/widget/src/float.rs +++ b/widget/src/float.rs @@ -125,7 +125,7 @@ where fn update( &mut self, - state: &mut widget::Tree, + tree: &mut widget::Tree, event: &Event, layout: Layout<'_>, cursor: mouse::Cursor, @@ -139,7 +139,7 @@ where } self.content.as_widget_mut().update( - state, event, layout, cursor, renderer, clipboard, shell, viewport, + tree, event, layout, cursor, renderer, clipboard, shell, viewport, ); } @@ -180,7 +180,7 @@ where fn mouse_interaction( &self, - state: &widget::Tree, + tree: &widget::Tree, layout: Layout<'_>, cursor: mouse::Cursor, viewport: &Rectangle, @@ -192,19 +192,19 @@ where self.content .as_widget() - .mouse_interaction(state, layout, cursor, viewport, renderer) + .mouse_interaction(tree, layout, cursor, viewport, renderer) } fn operate( &mut self, - state: &mut widget::Tree, + tree: &mut widget::Tree, layout: Layout<'_>, renderer: &Renderer, operation: &mut dyn widget::Operation, ) { self.content .as_widget_mut() - .operate(state, layout, renderer, operation); + .operate(tree, layout, renderer, operation); } fn overlay<'a>( diff --git a/widget/src/grid.rs b/widget/src/grid.rs index b1d73050..c991a912 100644 --- a/widget/src/grid.rs +++ b/widget/src/grid.rs @@ -281,14 +281,14 @@ where shell: &mut Shell<'_, Message>, viewport: &Rectangle, ) { - for ((child, state), layout) in self + for ((child, tree), layout) in self .children .iter_mut() .zip(&mut tree.children) .zip(layout.children()) { child.as_widget_mut().update( - state, event, layout, cursor, renderer, clipboard, shell, + tree, event, layout, cursor, renderer, clipboard, shell, viewport, ); } @@ -306,10 +306,10 @@ where .iter() .zip(&tree.children) .zip(layout.children()) - .map(|((child, state), layout)| { - child.as_widget().mouse_interaction( - state, layout, cursor, viewport, renderer, - ) + .map(|((child, tree), layout)| { + child + .as_widget() + .mouse_interaction(tree, layout, cursor, viewport, renderer) }) .max() .unwrap_or_default() @@ -326,7 +326,7 @@ where viewport: &Rectangle, ) { if let Some(viewport) = layout.bounds().intersection(viewport) { - for ((child, state), layout) in self + for ((child, tree), layout) in self .children .iter() .zip(&tree.children) @@ -334,7 +334,7 @@ where .filter(|(_, layout)| layout.bounds().intersects(&viewport)) { child.as_widget().draw( - state, renderer, theme, style, layout, cursor, &viewport, + tree, renderer, theme, style, layout, cursor, &viewport, ); } } diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs index 7eea2016..0f858ffd 100644 --- a/widget/src/helpers.rs +++ b/widget/src/helpers.rs @@ -647,19 +647,19 @@ where fn operate( &mut self, - state: &mut Tree, + tree: &mut Tree, layout: Layout<'_>, renderer: &Renderer, operation: &mut dyn operation::Operation, ) { self.content .as_widget_mut() - .operate(state, layout, renderer, operation); + .operate(tree, layout, renderer, operation); } fn update( &mut self, - state: &mut Tree, + tree: &mut Tree, event: &Event, layout: Layout<'_>, cursor: mouse::Cursor, @@ -674,7 +674,7 @@ where ); self.content.as_widget_mut().update( - state, event, layout, cursor, renderer, clipboard, shell, + tree, event, layout, cursor, renderer, clipboard, shell, viewport, ); diff --git a/widget/src/image.rs b/widget/src/image.rs index c5108d81..b1dafb62 100644 --- a/widget/src/image.rs +++ b/widget/src/image.rs @@ -383,7 +383,7 @@ where fn draw( &self, - _state: &Tree, + _tree: &Tree, renderer: &mut Renderer, _theme: &Theme, _style: &renderer::Style, diff --git a/widget/src/keyed/column.rs b/widget/src/keyed/column.rs index bdfa82e1..f98c58b2 100644 --- a/widget/src/keyed/column.rs +++ b/widget/src/keyed/column.rs @@ -308,14 +308,14 @@ where shell: &mut Shell<'_, Message>, viewport: &Rectangle, ) { - for ((child, state), layout) in self + for ((child, tree), layout) in self .children .iter_mut() .zip(&mut tree.children) .zip(layout.children()) { child.as_widget_mut().update( - state, event, layout, cursor, renderer, clipboard, shell, + tree, event, layout, cursor, renderer, clipboard, shell, viewport, ); } @@ -333,10 +333,10 @@ where .iter() .zip(&tree.children) .zip(layout.children()) - .map(|((child, state), layout)| { - child.as_widget().mouse_interaction( - state, layout, cursor, viewport, renderer, - ) + .map(|((child, tree), layout)| { + child + .as_widget() + .mouse_interaction(tree, layout, cursor, viewport, renderer) }) .max() .unwrap_or_default() diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs index 4f7bbe50..d804695a 100644 --- a/widget/src/overlay/menu.rs +++ b/widget/src/overlay/menu.rs @@ -168,7 +168,7 @@ where { position: Point, viewport: Rectangle, - state: &'a mut Tree, + tree: &'a mut Tree, list: Scrollable<'a, Message, Theme, Renderer>, width: f32, target_height: f32, @@ -226,7 +226,7 @@ where Self { position, viewport, - state: &mut state.tree, + tree: &mut state.tree, list, width, target_height, @@ -259,7 +259,7 @@ where ) .width(self.width); - let node = self.list.layout(self.state, renderer, &limits); + let node = self.list.layout(self.tree, renderer, &limits); let size = node.size(); node.move_to(if space_below > space_above { @@ -281,7 +281,7 @@ where let bounds = layout.bounds(); self.list.update( - self.state, event, layout, cursor, renderer, clipboard, shell, + self.tree, event, layout, cursor, renderer, clipboard, shell, &bounds, ); } @@ -293,7 +293,7 @@ where renderer: &Renderer, ) -> mouse::Interaction { self.list.mouse_interaction( - self.state, + self.tree, layout, cursor, &self.viewport, @@ -323,7 +323,7 @@ where ); self.list.draw( - self.state, renderer, theme, defaults, layout, cursor, &bounds, + self.tree, renderer, theme, defaults, layout, cursor, &bounds, ); } } @@ -487,7 +487,7 @@ where fn mouse_interaction( &self, - _state: &Tree, + _tree: &Tree, layout: Layout<'_>, cursor: mouse::Cursor, _viewport: &Rectangle, @@ -504,7 +504,7 @@ where fn draw( &self, - _state: &Tree, + _tree: &Tree, renderer: &mut Renderer, theme: &Theme, _style: &renderer::Style, diff --git a/widget/src/progress_bar.rs b/widget/src/progress_bar.rs index 25973027..f470c688 100644 --- a/widget/src/progress_bar.rs +++ b/widget/src/progress_bar.rs @@ -166,7 +166,7 @@ where fn draw( &self, - _state: &Tree, + _tree: &Tree, renderer: &mut Renderer, theme: &Theme, _style: &renderer::Style, diff --git a/widget/src/radio.rs b/widget/src/radio.rs index 17d0426a..5d0e4a66 100644 --- a/widget/src/radio.rs +++ b/widget/src/radio.rs @@ -326,7 +326,7 @@ where fn update( &mut self, - _state: &mut Tree, + _tree: &mut Tree, event: &Event, layout: Layout<'_>, cursor: mouse::Cursor, @@ -369,7 +369,7 @@ where fn mouse_interaction( &self, - _state: &Tree, + _tree: &Tree, layout: Layout<'_>, cursor: mouse::Cursor, _viewport: &Rectangle, diff --git a/widget/src/row.rs b/widget/src/row.rs index 6dabc926..448f40fe 100644 --- a/widget/src/row.rs +++ b/widget/src/row.rs @@ -258,14 +258,14 @@ where shell: &mut Shell<'_, Message>, viewport: &Rectangle, ) { - for ((child, state), layout) in self + for ((child, tree), layout) in self .children .iter_mut() .zip(&mut tree.children) .zip(layout.children()) { child.as_widget_mut().update( - state, event, layout, cursor, renderer, clipboard, shell, + tree, event, layout, cursor, renderer, clipboard, shell, viewport, ); } @@ -283,10 +283,10 @@ where .iter() .zip(&tree.children) .zip(layout.children()) - .map(|((child, state), layout)| { - child.as_widget().mouse_interaction( - state, layout, cursor, viewport, renderer, - ) + .map(|((child, tree), layout)| { + child + .as_widget() + .mouse_interaction(tree, layout, cursor, viewport, renderer) }) .max() .unwrap_or_default() @@ -309,7 +309,7 @@ where viewport }; - for ((child, state), layout) in self + for ((child, tree), layout) in self .children .iter() .zip(&tree.children) @@ -317,7 +317,7 @@ where .filter(|(_, layout)| layout.bounds().intersects(viewport)) { child.as_widget().draw( - state, renderer, theme, style, layout, cursor, viewport, + tree, renderer, theme, style, layout, cursor, viewport, ); } } diff --git a/widget/src/rule.rs b/widget/src/rule.rs index 1472caed..badd4b7f 100644 --- a/widget/src/rule.rs +++ b/widget/src/rule.rs @@ -133,7 +133,7 @@ where fn draw( &self, - _state: &Tree, + _tree: &Tree, renderer: &mut Renderer, theme: &Theme, _style: &renderer::Style, diff --git a/widget/src/space.rs b/widget/src/space.rs index 231d4704..9f20d814 100644 --- a/widget/src/space.rs +++ b/widget/src/space.rs @@ -81,7 +81,7 @@ where fn draw( &self, - _state: &Tree, + _tree: &Tree, _renderer: &mut Renderer, _theme: &Theme, _style: &renderer::Style, diff --git a/widget/src/stack.rs b/widget/src/stack.rs index 2a062ee4..18069227 100644 --- a/widget/src/stack.rs +++ b/widget/src/stack.rs @@ -224,7 +224,7 @@ where let is_over = cursor.is_over(layout.bounds()); let end = self.children.len() - 1; - for (i, ((child, state), layout)) in self + for (i, ((child, tree), layout)) in self .children .iter_mut() .rev() @@ -233,7 +233,7 @@ where .enumerate() { child.as_widget_mut().update( - state, event, layout, cursor, renderer, clipboard, shell, + tree, event, layout, cursor, renderer, clipboard, shell, viewport, ); @@ -243,7 +243,7 @@ where if i < end && is_over && !cursor.is_levitating() { let interaction = child.as_widget().mouse_interaction( - state, layout, cursor, viewport, renderer, + tree, layout, cursor, viewport, renderer, ); if interaction != mouse::Interaction::None { @@ -266,10 +266,10 @@ where .rev() .zip(tree.children.iter().rev()) .zip(layout.children().rev()) - .map(|((child, state), layout)| { - child.as_widget().mouse_interaction( - state, layout, cursor, viewport, renderer, - ) + .map(|((child, tree), layout)| { + child + .as_widget() + .mouse_interaction(tree, layout, cursor, viewport, renderer) }) .find(|&interaction| interaction != mouse::Interaction::None) .unwrap_or_default() @@ -298,9 +298,9 @@ where .rev() .zip(tree.children.iter().rev()) .zip(layout.children().rev()) - .position(|((layer, state), layout)| { + .position(|((layer, tree), layout)| { let interaction = layer.as_widget().mouse_interaction( - state, layout, cursor, viewport, renderer, + tree, layout, cursor, viewport, renderer, ); interaction != mouse::Interaction::None @@ -323,30 +323,30 @@ where let mut draw_layer = |i, layer: &Element<'a, Message, Theme, Renderer>, - state, + tree, layout, cursor| { if i > 0 { renderer.with_layer(*viewport, |renderer| { layer.as_widget().draw( - state, renderer, theme, style, layout, cursor, + tree, renderer, theme, style, layout, cursor, viewport, ); }); } else { layer.as_widget().draw( - state, renderer, theme, style, layout, cursor, + tree, renderer, theme, style, layout, cursor, viewport, ); } }; - for (i, ((layer, state), layout)) in layers.take(layers_below) { - draw_layer(i, layer, state, layout, mouse::Cursor::Unavailable); + for (i, ((layer, tree), layout)) in layers.take(layers_below) { + draw_layer(i, layer, tree, layout, mouse::Cursor::Unavailable); } - for (i, ((layer, state), layout)) in layers { - draw_layer(i, layer, state, layout, cursor); + for (i, ((layer, tree), layout)) in layers { + draw_layer(i, layer, tree, layout, cursor); } } } diff --git a/widget/src/table.rs b/widget/src/table.rs index 44faa86d..cdb6f17e 100644 --- a/widget/src/table.rs +++ b/widget/src/table.rs @@ -226,8 +226,8 @@ where .collect() } - fn diff(&self, state: &mut widget::Tree) { - state.diff_children(&self.cells); + fn diff(&self, tree: &mut widget::Tree) { + tree.diff_children(&self.cells); } fn layout( @@ -472,14 +472,14 @@ where shell: &mut core::Shell<'_, Message>, viewport: &Rectangle, ) { - for ((cell, state), layout) in self + for ((cell, tree), layout) in self .cells .iter_mut() .zip(&mut tree.children) .zip(layout.children()) { cell.as_widget_mut().update( - state, event, layout, cursor, renderer, clipboard, shell, + tree, event, layout, cursor, renderer, clipboard, shell, viewport, ); } @@ -570,10 +570,9 @@ where .iter() .zip(&tree.children) .zip(layout.children()) - .map(|((cell, state), layout)| { - cell.as_widget().mouse_interaction( - state, layout, cursor, viewport, renderer, - ) + .map(|((cell, tree), layout)| { + cell.as_widget() + .mouse_interaction(tree, layout, cursor, viewport, renderer) }) .max() .unwrap_or_default() @@ -599,7 +598,7 @@ where fn overlay<'b>( &'b mut self, - state: &'b mut widget::Tree, + tree: &'b mut widget::Tree, layout: Layout<'b>, renderer: &Renderer, viewport: &Rectangle, @@ -607,7 +606,7 @@ where ) -> Option> { overlay::from_children( &mut self.cells, - state, + tree, layout, renderer, viewport, diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs index 2859f568..607628da 100644 --- a/widget/src/text_editor.rs +++ b/widget/src/text_editor.rs @@ -1056,7 +1056,7 @@ where fn mouse_interaction( &self, - _state: &widget::Tree, + _tree: &widget::Tree, layout: Layout<'_>, cursor: mouse::Cursor, _viewport: &Rectangle, diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs index cbeefee5..6832d789 100644 --- a/widget/src/text_input.rs +++ b/widget/src/text_input.rs @@ -1393,7 +1393,7 @@ where fn mouse_interaction( &self, - _state: &Tree, + _tree: &Tree, layout: Layout<'_>, cursor: mouse::Cursor, _viewport: &Rectangle, diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs index 1810d906..360a8109 100644 --- a/widget/src/toggler.rs +++ b/widget/src/toggler.rs @@ -316,7 +316,7 @@ where fn update( &mut self, - _state: &mut Tree, + _tree: &mut Tree, event: &Event, layout: Layout<'_>, cursor: mouse::Cursor, @@ -368,7 +368,7 @@ where fn mouse_interaction( &self, - _state: &Tree, + _tree: &Tree, layout: Layout<'_>, cursor: mouse::Cursor, _viewport: &Rectangle, diff --git a/widget/src/tooltip.rs b/widget/src/tooltip.rs index c77cbc78..8518b07c 100644 --- a/widget/src/tooltip.rs +++ b/widget/src/tooltip.rs @@ -300,7 +300,7 @@ where Some(overlay::Element::new(Box::new(Overlay { position: layout.position() + translation, tooltip: &mut self.tooltip, - state: children.next().unwrap(), + tree: children.next().unwrap(), cursor_position, content_bounds: layout.bounds(), snap_within_viewport: self.snap_within_viewport, @@ -372,7 +372,7 @@ where { position: Point, tooltip: &'b mut Element<'a, Message, Theme, Renderer>, - state: &'b mut widget::Tree, + tree: &'b mut widget::Tree, cursor_position: Point, content_bounds: Rectangle, snap_within_viewport: bool, @@ -392,7 +392,7 @@ where let viewport = Rectangle::with_size(bounds); let tooltip_layout = self.tooltip.as_widget_mut().layout( - self.state, + self.tree, renderer, &layout::Limits::new( Size::ZERO, @@ -507,7 +507,7 @@ where }; self.tooltip.as_widget().draw( - self.state, + self.tree, renderer, theme, &defaults,