leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix inconsistent naming of tree parameter in Widget trait (#2950)

Browse source 
* fix inconsistent naming of tree parameter in widget trait

* rename `Tree` parameter in various usages across iced
This commit is contained in:
edwloef 2025-11-25 23:58:07 +01:00 • committed by GitHub
parent 6f0b408f90
commit 6bbe189809
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 127 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/custom_quad/src/main.rs
View file

@ -185,7 +185,7 @@ mod quad {
fn draw(
&self,
_state: &widget::Tree,
_tree: &widget::Tree,
renderer: &mut Renderer,
_theme: &Theme,
_style: &renderer::Style,

2
examples/custom_widget/src/main.rs
View file

@ -43,7 +43,7 @@ mod circle {
fn draw(
&self,
_state: &widget::Tree,
_tree: &widget::Tree,
renderer: &mut Renderer,
_theme: &Theme,
_style: &renderer::Style,

2
examples/loupe/src/main.rs
View file

@ -146,7 +146,7 @@ mod loupe {
fn mouse_interaction(
&self,
_state: &widget::Tree,
_tree: &widget::Tree,
layout: Layout<'_>,
cursor: mouse::Cursor,
_viewport: &Rectangle,

40
examples/toast/src/main.rs
View file

@ -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<overlay::Element<'b, Message, Theme, Renderer>> {
let instants = state.state.downcast_mut::<Vec<Option<Instant>>>();
let instants = tree.state.downcast_mut::<Vec<Option<Instant>>>();
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<Instant>],
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

2
examples/vectorial_text/src/main.rs
View file

@ -117,7 +117,7 @@ impl<Message> canvas::Program<Message> for State {
fn draw(
&self,
_state: &Self::State,
_tree: &Self::State,
renderer: &Renderer,
theme: &Theme,
bounds: Rectangle,