summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-10-25 22:06:06 +0200
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-11-05 23:52:58 +0100
commitf02bfc3f68322bea0c56283d76888714be401ec2 (patch)
treed7793a7572cbc441e16fa982155343bcc54e83ea
parentdcc184b01b753dbecb500205391f6eaaa21c8683 (diff)
downloadiced-f02bfc3f68322bea0c56283d76888714be401ec2.tar.gz
iced-f02bfc3f68322bea0c56283d76888714be401ec2.tar.bz2
iced-f02bfc3f68322bea0c56283d76888714be401ec2.zip
Rename `Widget::on_event` to `update`
-rw-r--r--core/src/element.rs8
-rw-r--r--core/src/widget.rs2
-rw-r--r--examples/loading_spinners/src/circular.rs2
-rw-r--r--examples/loading_spinners/src/linear.rs2
-rw-r--r--examples/toast/src/main.rs6
-rw-r--r--runtime/src/user_interface.rs2
-rw-r--r--widget/src/button.rs4
-rw-r--r--widget/src/canvas.rs2
-rw-r--r--widget/src/checkbox.rs2
-rw-r--r--widget/src/column.rs4
-rw-r--r--widget/src/combo_box.rs6
-rw-r--r--widget/src/container.rs4
-rw-r--r--widget/src/helpers.rs10
-rw-r--r--widget/src/image/viewer.rs2
-rw-r--r--widget/src/keyed/column.rs4
-rw-r--r--widget/src/lazy.rs4
-rw-r--r--widget/src/lazy/component.rs4
-rw-r--r--widget/src/lazy/responsive.rs4
-rw-r--r--widget/src/mouse_area.rs4
-rw-r--r--widget/src/overlay/menu.rs4
-rw-r--r--widget/src/pane_grid.rs2
-rw-r--r--widget/src/pane_grid/content.rs2
-rw-r--r--widget/src/pane_grid/title_bar.rs8
-rw-r--r--widget/src/pick_list.rs2
-rw-r--r--widget/src/radio.rs2
-rw-r--r--widget/src/row.rs8
-rw-r--r--widget/src/scrollable.rs4
-rw-r--r--widget/src/shader.rs2
-rw-r--r--widget/src/slider.rs2
-rw-r--r--widget/src/stack.rs4
-rw-r--r--widget/src/text/rich.rs2
-rw-r--r--widget/src/text_editor.rs2
-rw-r--r--widget/src/text_input.rs2
-rw-r--r--widget/src/themer.rs4
-rw-r--r--widget/src/toggler.rs2
-rw-r--r--widget/src/tooltip.rs4
-rw-r--r--widget/src/vertical_slider.rs2
37 files changed, 67 insertions, 67 deletions
diff --git a/core/src/element.rs b/core/src/element.rs
index 8276b70c..03e56b43 100644
--- a/core/src/element.rs
+++ b/core/src/element.rs
@@ -308,7 +308,7 @@ where
self.widget.operate(tree, layout, renderer, operation);
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -322,7 +322,7 @@ where
let mut local_messages = Vec::new();
let mut local_shell = Shell::new(&mut local_messages);
- self.widget.on_event(
+ self.widget.update(
tree,
event,
layout,
@@ -444,7 +444,7 @@ where
.operate(state, layout, renderer, operation);
}
- fn on_event(
+ fn update(
&mut self,
state: &mut Tree,
event: Event,
@@ -455,7 +455,7 @@ where
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) {
- self.element.widget.on_event(
+ self.element.widget.update(
state, event, layout, cursor, renderer, clipboard, shell, viewport,
);
}
diff --git a/core/src/widget.rs b/core/src/widget.rs
index bddf99cc..2a40f823 100644
--- a/core/src/widget.rs
+++ b/core/src/widget.rs
@@ -111,7 +111,7 @@ where
/// Processes a runtime [`Event`].
///
/// By default, it does nothing.
- fn on_event(
+ fn update(
&mut self,
_state: &mut Tree,
_event: Event,
diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs
index e6b59cae..a10d5cec 100644
--- a/examples/loading_spinners/src/circular.rs
+++ b/examples/loading_spinners/src/circular.rs
@@ -261,7 +261,7 @@ where
layout::atomic(limits, self.size, self.size)
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
diff --git a/examples/loading_spinners/src/linear.rs b/examples/loading_spinners/src/linear.rs
index 34576261..91c8d523 100644
--- a/examples/loading_spinners/src/linear.rs
+++ b/examples/loading_spinners/src/linear.rs
@@ -175,7 +175,7 @@ where
layout::atomic(limits, self.width, self.height)
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs
index 079b96b4..893c52e2 100644
--- a/examples/toast/src/main.rs
+++ b/examples/toast/src/main.rs
@@ -358,7 +358,7 @@ mod toast {
});
}
- fn on_event(
+ fn update(
&mut self,
state: &mut Tree,
event: Event,
@@ -369,7 +369,7 @@ mod toast {
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) {
- self.content.as_widget_mut().on_event(
+ self.content.as_widget_mut().update(
&mut state.children[0],
event,
layout,
@@ -529,7 +529,7 @@ mod toast {
let mut local_messages = vec![];
let mut local_shell = Shell::new(&mut local_messages);
- child.as_widget_mut().on_event(
+ child.as_widget_mut().update(
state,
event.clone(),
layout,
diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs
index cae17bcc..6997caf4 100644
--- a/runtime/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -308,7 +308,7 @@ where
let mut shell = Shell::new(messages);
- self.root.as_widget_mut().on_event(
+ self.root.as_widget_mut().update(
&mut self.state,
event,
Layout::new(&self.base),
diff --git a/widget/src/button.rs b/widget/src/button.rs
index 6be17f59..64f2b793 100644
--- a/widget/src/button.rs
+++ b/widget/src/button.rs
@@ -273,7 +273,7 @@ where
});
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -284,7 +284,7 @@ where
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) {
- self.content.as_widget_mut().on_event(
+ self.content.as_widget_mut().update(
&mut tree.children[0],
event.clone(),
layout.children().next().unwrap(),
diff --git a/widget/src/canvas.rs b/widget/src/canvas.rs
index a9c65bb6..63a25064 100644
--- a/widget/src/canvas.rs
+++ b/widget/src/canvas.rs
@@ -213,7 +213,7 @@ where
layout::atomic(limits, self.width, self.height)
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: core::Event,
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index 9b5f3602..625dee7c 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -302,7 +302,7 @@ where
)
}
- fn on_event(
+ fn update(
&mut self,
_tree: &mut Tree,
event: Event,
diff --git a/widget/src/column.rs b/widget/src/column.rs
index 3fdc17f8..a3efab94 100644
--- a/widget/src/column.rs
+++ b/widget/src/column.rs
@@ -257,7 +257,7 @@ where
});
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -274,7 +274,7 @@ where
.zip(&mut tree.children)
.zip(layout.children())
{
- child.as_widget_mut().on_event(
+ child.as_widget_mut().update(
state,
event.clone(),
layout,
diff --git a/widget/src/combo_box.rs b/widget/src/combo_box.rs
index 1122861f..6c5d2309 100644
--- a/widget/src/combo_box.rs
+++ b/widget/src/combo_box.rs
@@ -510,7 +510,7 @@ where
vec![widget::Tree::new(&self.text_input as &dyn Widget<_, _, _>)]
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut widget::Tree,
event: Event,
@@ -539,7 +539,7 @@ where
let mut local_shell = Shell::new(&mut local_messages);
// Provide it to the widget
- self.text_input.on_event(
+ self.text_input.update(
&mut tree.children[0],
event.clone(),
layout,
@@ -728,7 +728,7 @@ where
published_message_to_shell = true;
// Unfocus the input
- self.text_input.on_event(
+ self.text_input.update(
&mut tree.children[0],
Event::Mouse(mouse::Event::ButtonPressed(
mouse::Button::Left,
diff --git a/widget/src/container.rs b/widget/src/container.rs
index f96c495c..b7b2b39e 100644
--- a/widget/src/container.rs
+++ b/widget/src/container.rs
@@ -297,7 +297,7 @@ where
);
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -308,7 +308,7 @@ where
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) {
- self.content.as_widget_mut().on_event(
+ self.content.as_widget_mut().update(
tree,
event,
layout.children().next().unwrap(),
diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
index 13d69e1f..e1474d34 100644
--- a/widget/src/helpers.rs
+++ b/widget/src/helpers.rs
@@ -438,7 +438,7 @@ where
.operate(state, layout, renderer, operation);
}
- fn on_event(
+ fn update(
&mut self,
state: &mut Tree,
event: Event,
@@ -454,7 +454,7 @@ where
core::Event::Mouse(mouse::Event::ButtonPressed(_))
);
- self.content.as_widget_mut().on_event(
+ self.content.as_widget_mut().update(
state, event, layout, cursor, renderer, clipboard, shell,
viewport,
);
@@ -640,7 +640,7 @@ where
}
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -682,7 +682,7 @@ where
|| self.is_top_focused
|| self.is_top_overlay_active
{
- self.top.as_widget_mut().on_event(
+ self.top.as_widget_mut().update(
top_tree,
event.clone(),
top_layout,
@@ -698,7 +698,7 @@ where
return;
}
- self.base.as_widget_mut().on_event(
+ self.base.as_widget_mut().update(
base_tree,
event.clone(),
base_layout,
diff --git a/widget/src/image/viewer.rs b/widget/src/image/viewer.rs
index 5787200b..20a7955f 100644
--- a/widget/src/image/viewer.rs
+++ b/widget/src/image/viewer.rs
@@ -148,7 +148,7 @@ where
layout::Node::new(final_size)
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
diff --git a/widget/src/keyed/column.rs b/widget/src/keyed/column.rs
index 1172785a..055e2ea1 100644
--- a/widget/src/keyed/column.rs
+++ b/widget/src/keyed/column.rs
@@ -297,7 +297,7 @@ where
});
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -314,7 +314,7 @@ where
.zip(&mut tree.children)
.zip(layout.children())
{
- child.as_widget_mut().on_event(
+ child.as_widget_mut().update(
state,
event.clone(),
layout,
diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs
index 4a9a6154..0b4e3cad 100644
--- a/widget/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -195,7 +195,7 @@ where
});
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -207,7 +207,7 @@ where
viewport: &Rectangle,
) {
self.with_element_mut(|element| {
- element.as_widget_mut().on_event(
+ element.as_widget_mut().update(
&mut tree.children[0],
event,
layout,
diff --git a/widget/src/lazy/component.rs b/widget/src/lazy/component.rs
index 062e6f35..6f661ef6 100644
--- a/widget/src/lazy/component.rs
+++ b/widget/src/lazy/component.rs
@@ -311,7 +311,7 @@ where
})
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: core::Event,
@@ -327,7 +327,7 @@ where
let t = tree.state.downcast_mut::<Rc<RefCell<Option<Tree>>>>();
self.with_element_mut(|element| {
- element.as_widget_mut().on_event(
+ element.as_widget_mut().update(
&mut t.borrow_mut().as_mut().unwrap().children[0],
event,
layout,
diff --git a/widget/src/lazy/responsive.rs b/widget/src/lazy/responsive.rs
index c17798a6..a8abbce8 100644
--- a/widget/src/lazy/responsive.rs
+++ b/widget/src/lazy/responsive.rs
@@ -182,7 +182,7 @@ where
);
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -205,7 +205,7 @@ where
layout,
&self.view,
|tree, renderer, layout, element| {
- element.as_widget_mut().on_event(
+ element.as_widget_mut().update(
tree,
event,
layout,
diff --git a/widget/src/mouse_area.rs b/widget/src/mouse_area.rs
index 50188abd..d9215a7b 100644
--- a/widget/src/mouse_area.rs
+++ b/widget/src/mouse_area.rs
@@ -215,7 +215,7 @@ where
);
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -226,7 +226,7 @@ where
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) {
- self.content.as_widget_mut().on_event(
+ self.content.as_widget_mut().update(
&mut tree.children[0],
event.clone(),
layout,
diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index 78ee3da6..b0c0bbad 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -273,7 +273,7 @@ where
) {
let bounds = layout.bounds();
- self.list.on_event(
+ self.list.update(
self.state, event, layout, cursor, renderer, clipboard, shell,
&bounds,
);
@@ -386,7 +386,7 @@ where
layout::Node::new(size)
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index 29b7ac87..a966627a 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -422,7 +422,7 @@ where
});
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs
index 81a5cc1e..e0199f0a 100644
--- a/widget/src/pane_grid/content.rs
+++ b/widget/src/pane_grid/content.rs
@@ -271,7 +271,7 @@ where
};
if !is_picked {
- self.body.as_widget_mut().on_event(
+ self.body.as_widget_mut().update(
&mut tree.children[0],
event,
body_layout,
diff --git a/widget/src/pane_grid/title_bar.rs b/widget/src/pane_grid/title_bar.rs
index ec1dc302..618eb4c5 100644
--- a/widget/src/pane_grid/title_bar.rs
+++ b/widget/src/pane_grid/title_bar.rs
@@ -454,7 +454,7 @@ where
if let Some(compact) = controls.compact.as_mut() {
let compact_layout = children.next().unwrap();
- compact.as_widget_mut().on_event(
+ compact.as_widget_mut().update(
&mut tree.children[2],
event.clone(),
compact_layout,
@@ -467,7 +467,7 @@ where
} else {
show_title = false;
- controls.full.as_widget_mut().on_event(
+ controls.full.as_widget_mut().update(
&mut tree.children[1],
event.clone(),
controls_layout,
@@ -479,7 +479,7 @@ where
);
}
} else {
- controls.full.as_widget_mut().on_event(
+ controls.full.as_widget_mut().update(
&mut tree.children[1],
event.clone(),
controls_layout,
@@ -493,7 +493,7 @@ where
}
if show_title {
- self.content.as_widget_mut().on_event(
+ self.content.as_widget_mut().update(
&mut tree.children[0],
event,
title_layout,
diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index 9eb43e72..32f859da 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -427,7 +427,7 @@ where
layout::Node::new(size)
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
diff --git a/widget/src/radio.rs b/widget/src/radio.rs
index 70e1c423..b38ae6b4 100644
--- a/widget/src/radio.rs
+++ b/widget/src/radio.rs
@@ -323,7 +323,7 @@ where
)
}
- fn on_event(
+ fn update(
&mut self,
_state: &mut Tree,
event: Event,
diff --git a/widget/src/row.rs b/widget/src/row.rs
index a4b6aa2a..96a4ab92 100644
--- a/widget/src/row.rs
+++ b/widget/src/row.rs
@@ -253,7 +253,7 @@ where
});
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -270,7 +270,7 @@ where
.zip(&mut tree.children)
.zip(layout.children())
{
- child.as_widget_mut().on_event(
+ child.as_widget_mut().update(
state,
event.clone(),
layout,
@@ -492,7 +492,7 @@ where
self.row.operate(tree, layout, renderer, operation);
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -503,7 +503,7 @@ where
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) {
- self.row.on_event(
+ self.row.update(
tree, event, layout, cursor, renderer, clipboard, shell, viewport,
);
}
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 33d4f545..a6a41d9f 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -508,7 +508,7 @@ where
);
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -724,7 +724,7 @@ where
let translation =
state.translation(self.direction, bounds, content_bounds);
- self.content.as_widget_mut().on_event(
+ self.content.as_widget_mut().update(
&mut tree.children[0],
event.clone(),
content,
diff --git a/widget/src/shader.rs b/widget/src/shader.rs
index 5e4d3915..115a5ed9 100644
--- a/widget/src/shader.rs
+++ b/widget/src/shader.rs
@@ -87,7 +87,7 @@ where
layout::atomic(limits, self.width, self.height)
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: crate::core::Event,
diff --git a/widget/src/slider.rs b/widget/src/slider.rs
index 4a424bd9..84630f9e 100644
--- a/widget/src/slider.rs
+++ b/widget/src/slider.rs
@@ -242,7 +242,7 @@ where
layout::atomic(limits, self.width, self.height)
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
diff --git a/widget/src/stack.rs b/widget/src/stack.rs
index 2cb628ab..52fd5031 100644
--- a/widget/src/stack.rs
+++ b/widget/src/stack.rs
@@ -204,7 +204,7 @@ where
});
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -224,7 +224,7 @@ where
.zip(tree.children.iter_mut().rev())
.zip(layout.children().rev())
{
- child.as_widget_mut().on_event(
+ child.as_widget_mut().update(
state,
event.clone(),
layout,
diff --git a/widget/src/text/rich.rs b/widget/src/text/rich.rs
index f778b029..7ef2707b 100644
--- a/widget/src/text/rich.rs
+++ b/widget/src/text/rich.rs
@@ -354,7 +354,7 @@ where
);
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 292e584e..32e14946 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -595,7 +595,7 @@ where
}
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut widget::Tree,
event: Event,
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index 87dffb98..51e61cc0 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -627,7 +627,7 @@ where
operation.text_input(state, self.id.as_ref().map(|id| &id.0));
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
diff --git a/widget/src/themer.rs b/widget/src/themer.rs
index 649cfbdd..41d2aeae 100644
--- a/widget/src/themer.rs
+++ b/widget/src/themer.rs
@@ -110,7 +110,7 @@ where
.operate(tree, layout, renderer, operation);
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,
@@ -121,7 +121,7 @@ where
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) {
- self.content.as_widget_mut().on_event(
+ self.content.as_widget_mut().update(
tree, event, layout, cursor, renderer, clipboard, shell, viewport,
);
}
diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index 8461fbb2..5dfa0c0e 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -306,7 +306,7 @@ where
)
}
- fn on_event(
+ fn update(
&mut self,
_state: &mut Tree,
event: Event,
diff --git a/widget/src/tooltip.rs b/widget/src/tooltip.rs
index 91151acc..e66f5e4a 100644
--- a/widget/src/tooltip.rs
+++ b/widget/src/tooltip.rs
@@ -189,7 +189,7 @@ where
.layout(&mut tree.children[0], renderer, limits)
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut widget::Tree,
event: Event,
@@ -215,7 +215,7 @@ where
shell.invalidate_layout();
}
- self.content.as_widget_mut().on_event(
+ self.content.as_widget_mut().update(
&mut tree.children[0],
event,
layout,
diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs
index e7e36d2a..ec72a455 100644
--- a/widget/src/vertical_slider.rs
+++ b/widget/src/vertical_slider.rs
@@ -243,7 +243,7 @@ where
layout::atomic(limits, self.width, self.height)
}
- fn on_event(
+ fn update(
&mut self,
tree: &mut Tree,
event: Event,