diff options
author | 2024-11-06 00:02:46 +0100 | |
---|---|---|
committer | 2024-11-06 00:02:46 +0100 | |
commit | e5f1e31a5c068fe992cab076661cb6e2d120bdf1 (patch) | |
tree | e4be53b3bf9c73868f6694378a0eea670e270f52 | |
parent | 03bffe3db61b51d9e28f42c5bfea421b5612c484 (diff) | |
download | iced-e5f1e31a5c068fe992cab076661cb6e2d120bdf1.tar.gz iced-e5f1e31a5c068fe992cab076661cb6e2d120bdf1.tar.bz2 iced-e5f1e31a5c068fe992cab076661cb6e2d120bdf1.zip |
Rename `Overlay::on_event` to `update`
-rw-r--r-- | core/src/overlay.rs | 2 | ||||
-rw-r--r-- | core/src/overlay/element.rs | 8 | ||||
-rw-r--r-- | core/src/overlay/group.rs | 4 | ||||
-rw-r--r-- | examples/toast/src/main.rs | 2 | ||||
-rw-r--r-- | runtime/src/overlay/nested.rs | 4 | ||||
-rw-r--r-- | runtime/src/user_interface.rs | 2 | ||||
-rw-r--r-- | widget/src/lazy.rs | 4 | ||||
-rw-r--r-- | widget/src/lazy/component.rs | 4 | ||||
-rw-r--r-- | widget/src/lazy/responsive.rs | 4 | ||||
-rw-r--r-- | widget/src/overlay/menu.rs | 2 | ||||
-rw-r--r-- | widget/src/pane_grid.rs | 2 | ||||
-rw-r--r-- | widget/src/pane_grid/content.rs | 4 | ||||
-rw-r--r-- | widget/src/pane_grid/title_bar.rs | 2 | ||||
-rw-r--r-- | widget/src/themer.rs | 7 |
14 files changed, 25 insertions, 26 deletions
diff --git a/core/src/overlay.rs b/core/src/overlay.rs index e063bb94..383663af 100644 --- a/core/src/overlay.rs +++ b/core/src/overlay.rs @@ -56,7 +56,7 @@ where /// * a [`Clipboard`], if available /// /// By default, it does nothing. - fn on_event( + fn update( &mut self, _event: Event, _layout: Layout<'_>, diff --git a/core/src/overlay/element.rs b/core/src/overlay/element.rs index 4a242213..ed870feb 100644 --- a/core/src/overlay/element.rs +++ b/core/src/overlay/element.rs @@ -49,7 +49,7 @@ where } /// Processes a runtime [`Event`]. - pub fn on_event( + pub fn update( &mut self, event: Event, layout: Layout<'_>, @@ -59,7 +59,7 @@ where shell: &mut Shell<'_, Message>, ) { self.overlay - .on_event(event, layout, cursor, renderer, clipboard, shell); + .update(event, layout, cursor, renderer, clipboard, shell); } /// Returns the current [`mouse::Interaction`] of the [`Element`]. @@ -148,7 +148,7 @@ where self.content.operate(layout, renderer, operation); } - fn on_event( + fn update( &mut self, event: Event, layout: Layout<'_>, @@ -160,7 +160,7 @@ where let mut local_messages = Vec::new(); let mut local_shell = Shell::new(&mut local_messages); - self.content.on_event( + self.content.update( event, layout, cursor, diff --git a/core/src/overlay/group.rs b/core/src/overlay/group.rs index 11ebd579..2b374252 100644 --- a/core/src/overlay/group.rs +++ b/core/src/overlay/group.rs @@ -72,7 +72,7 @@ where ) } - fn on_event( + fn update( &mut self, event: Event, layout: Layout<'_>, @@ -82,7 +82,7 @@ where shell: &mut Shell<'_, Message>, ) { for (child, layout) in self.children.iter_mut().zip(layout.children()) { - child.on_event( + child.update( event.clone(), layout, cursor, diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs index 893c52e2..8d1e3924 100644 --- a/examples/toast/src/main.rs +++ b/examples/toast/src/main.rs @@ -489,7 +489,7 @@ mod toast { .translate(Vector::new(self.position.x, self.position.y)) } - fn on_event( + fn update( &mut self, event: Event, layout: Layout<'_>, diff --git a/runtime/src/overlay/nested.rs b/runtime/src/overlay/nested.rs index 45f6b220..342ad70c 100644 --- a/runtime/src/overlay/nested.rs +++ b/runtime/src/overlay/nested.rs @@ -158,7 +158,7 @@ where } /// Processes a runtime [`Event`]. - pub fn on_event( + pub fn update( &mut self, event: Event, layout: Layout<'_>, @@ -211,7 +211,7 @@ where }) .unwrap_or_default(); - element.on_event( + element.update( event, layout, if nested_is_over { diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs index 6997caf4..b2826f71 100644 --- a/runtime/src/user_interface.rs +++ b/runtime/src/user_interface.rs @@ -210,7 +210,7 @@ where for event in events.iter().cloned() { let mut shell = Shell::new(messages); - overlay.on_event( + overlay.update( event, Layout::new(&layout), cursor, diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs index 0b4e3cad..07b90c93 100644 --- a/widget/src/lazy.rs +++ b/widget/src/lazy.rs @@ -386,7 +386,7 @@ where .unwrap_or_default() } - fn on_event( + fn update( &mut self, event: Event, layout: Layout<'_>, @@ -396,7 +396,7 @@ where shell: &mut Shell<'_, Message>, ) { let _ = self.with_overlay_mut_maybe(|overlay| { - overlay.on_event(event, layout, cursor, renderer, clipboard, shell); + overlay.update(event, layout, cursor, renderer, clipboard, shell); }); } diff --git a/widget/src/lazy/component.rs b/widget/src/lazy/component.rs index 6f661ef6..1758b963 100644 --- a/widget/src/lazy/component.rs +++ b/widget/src/lazy/component.rs @@ -601,7 +601,7 @@ where .unwrap_or_default() } - fn on_event( + fn update( &mut self, event: core::Event, layout: Layout<'_>, @@ -614,7 +614,7 @@ where let mut local_shell = Shell::new(&mut local_messages); let _ = self.with_overlay_mut_maybe(|overlay| { - overlay.on_event( + overlay.update( event, layout, cursor, diff --git a/widget/src/lazy/responsive.rs b/widget/src/lazy/responsive.rs index f9bd0334..2aef1fa3 100644 --- a/widget/src/lazy/responsive.rs +++ b/widget/src/lazy/responsive.rs @@ -417,7 +417,7 @@ where .unwrap_or_default() } - fn on_event( + fn update( &mut self, event: Event, layout: Layout<'_>, @@ -429,7 +429,7 @@ where let mut is_layout_invalid = false; let _ = self.with_overlay_mut_maybe(|overlay| { - overlay.on_event(event, layout, cursor, renderer, clipboard, shell); + overlay.update(event, layout, cursor, renderer, clipboard, shell); is_layout_invalid = shell.is_layout_invalid(); }); diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs index b0c0bbad..7907ef01 100644 --- a/widget/src/overlay/menu.rs +++ b/widget/src/overlay/menu.rs @@ -262,7 +262,7 @@ where }) } - fn on_event( + fn update( &mut self, event: Event, layout: Layout<'_>, diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs index 691b0a93..9b87a2d3 100644 --- a/widget/src/pane_grid.rs +++ b/widget/src/pane_grid.rs @@ -674,7 +674,7 @@ where { let is_picked = picked_pane == Some(pane); - content.on_event( + content.update( tree, event.clone(), layout, diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs index f1f67023..fa9f7a9f 100644 --- a/widget/src/pane_grid/content.rs +++ b/widget/src/pane_grid/content.rs @@ -239,7 +239,7 @@ where ); } - pub(crate) fn on_event( + pub(crate) fn update( &mut self, tree: &mut Tree, event: Event, @@ -254,7 +254,7 @@ where let body_layout = if let Some(title_bar) = &mut self.title_bar { let mut children = layout.children(); - title_bar.on_event( + title_bar.update( &mut tree.children[1], event.clone(), children.next().unwrap(), diff --git a/widget/src/pane_grid/title_bar.rs b/widget/src/pane_grid/title_bar.rs index 618eb4c5..3f4a651e 100644 --- a/widget/src/pane_grid/title_bar.rs +++ b/widget/src/pane_grid/title_bar.rs @@ -427,7 +427,7 @@ where } } - pub(crate) fn on_event( + pub(crate) fn update( &mut self, tree: &mut Tree, event: Event, diff --git a/widget/src/themer.rs b/widget/src/themer.rs index 41d2aeae..82160f24 100644 --- a/widget/src/themer.rs +++ b/widget/src/themer.rs @@ -218,7 +218,7 @@ where ); } - fn on_event( + fn update( &mut self, event: Event, layout: Layout<'_>, @@ -227,9 +227,8 @@ where clipboard: &mut dyn Clipboard, shell: &mut Shell<'_, Message>, ) { - self.content.on_event( - event, layout, cursor, renderer, clipboard, shell, - ); + self.content + .update(event, layout, cursor, renderer, clipboard, shell); } fn operate( |