Rename Overlay::on_event to update
This commit is contained in:
parent
03bffe3db6
commit
e5f1e31a5c
14 changed files with 25 additions and 26 deletions
|
|
@ -56,7 +56,7 @@ where
|
||||||
/// * a [`Clipboard`], if available
|
/// * a [`Clipboard`], if available
|
||||||
///
|
///
|
||||||
/// By default, it does nothing.
|
/// By default, it does nothing.
|
||||||
fn on_event(
|
fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
_event: Event,
|
_event: Event,
|
||||||
_layout: Layout<'_>,
|
_layout: Layout<'_>,
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ where
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Processes a runtime [`Event`].
|
/// Processes a runtime [`Event`].
|
||||||
pub fn on_event(
|
pub fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
|
|
@ -59,7 +59,7 @@ where
|
||||||
shell: &mut Shell<'_, Message>,
|
shell: &mut Shell<'_, Message>,
|
||||||
) {
|
) {
|
||||||
self.overlay
|
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`].
|
/// Returns the current [`mouse::Interaction`] of the [`Element`].
|
||||||
|
|
@ -148,7 +148,7 @@ where
|
||||||
self.content.operate(layout, renderer, operation);
|
self.content.operate(layout, renderer, operation);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_event(
|
fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
|
|
@ -160,7 +160,7 @@ where
|
||||||
let mut local_messages = Vec::new();
|
let mut local_messages = Vec::new();
|
||||||
let mut local_shell = Shell::new(&mut local_messages);
|
let mut local_shell = Shell::new(&mut local_messages);
|
||||||
|
|
||||||
self.content.on_event(
|
self.content.update(
|
||||||
event,
|
event,
|
||||||
layout,
|
layout,
|
||||||
cursor,
|
cursor,
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ where
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_event(
|
fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
|
|
@ -82,7 +82,7 @@ where
|
||||||
shell: &mut Shell<'_, Message>,
|
shell: &mut Shell<'_, Message>,
|
||||||
) {
|
) {
|
||||||
for (child, layout) in self.children.iter_mut().zip(layout.children()) {
|
for (child, layout) in self.children.iter_mut().zip(layout.children()) {
|
||||||
child.on_event(
|
child.update(
|
||||||
event.clone(),
|
event.clone(),
|
||||||
layout,
|
layout,
|
||||||
cursor,
|
cursor,
|
||||||
|
|
|
||||||
|
|
@ -489,7 +489,7 @@ mod toast {
|
||||||
.translate(Vector::new(self.position.x, self.position.y))
|
.translate(Vector::new(self.position.x, self.position.y))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_event(
|
fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,7 @@ where
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Processes a runtime [`Event`].
|
/// Processes a runtime [`Event`].
|
||||||
pub fn on_event(
|
pub fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
|
|
@ -211,7 +211,7 @@ where
|
||||||
})
|
})
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
|
|
||||||
element.on_event(
|
element.update(
|
||||||
event,
|
event,
|
||||||
layout,
|
layout,
|
||||||
if nested_is_over {
|
if nested_is_over {
|
||||||
|
|
|
||||||
|
|
@ -210,7 +210,7 @@ where
|
||||||
for event in events.iter().cloned() {
|
for event in events.iter().cloned() {
|
||||||
let mut shell = Shell::new(messages);
|
let mut shell = Shell::new(messages);
|
||||||
|
|
||||||
overlay.on_event(
|
overlay.update(
|
||||||
event,
|
event,
|
||||||
Layout::new(&layout),
|
Layout::new(&layout),
|
||||||
cursor,
|
cursor,
|
||||||
|
|
|
||||||
|
|
@ -386,7 +386,7 @@ where
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_event(
|
fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
|
|
@ -396,7 +396,7 @@ where
|
||||||
shell: &mut Shell<'_, Message>,
|
shell: &mut Shell<'_, Message>,
|
||||||
) {
|
) {
|
||||||
let _ = self.with_overlay_mut_maybe(|overlay| {
|
let _ = self.with_overlay_mut_maybe(|overlay| {
|
||||||
overlay.on_event(event, layout, cursor, renderer, clipboard, shell);
|
overlay.update(event, layout, cursor, renderer, clipboard, shell);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -601,7 +601,7 @@ where
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_event(
|
fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: core::Event,
|
event: core::Event,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
|
|
@ -614,7 +614,7 @@ where
|
||||||
let mut local_shell = Shell::new(&mut local_messages);
|
let mut local_shell = Shell::new(&mut local_messages);
|
||||||
|
|
||||||
let _ = self.with_overlay_mut_maybe(|overlay| {
|
let _ = self.with_overlay_mut_maybe(|overlay| {
|
||||||
overlay.on_event(
|
overlay.update(
|
||||||
event,
|
event,
|
||||||
layout,
|
layout,
|
||||||
cursor,
|
cursor,
|
||||||
|
|
|
||||||
|
|
@ -417,7 +417,7 @@ where
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_event(
|
fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
|
|
@ -429,7 +429,7 @@ where
|
||||||
let mut is_layout_invalid = false;
|
let mut is_layout_invalid = false;
|
||||||
|
|
||||||
let _ = self.with_overlay_mut_maybe(|overlay| {
|
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();
|
is_layout_invalid = shell.is_layout_invalid();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -262,7 +262,7 @@ where
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_event(
|
fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
|
|
|
||||||
|
|
@ -674,7 +674,7 @@ where
|
||||||
{
|
{
|
||||||
let is_picked = picked_pane == Some(pane);
|
let is_picked = picked_pane == Some(pane);
|
||||||
|
|
||||||
content.on_event(
|
content.update(
|
||||||
tree,
|
tree,
|
||||||
event.clone(),
|
event.clone(),
|
||||||
layout,
|
layout,
|
||||||
|
|
|
||||||
|
|
@ -239,7 +239,7 @@ where
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn on_event(
|
pub(crate) fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
tree: &mut Tree,
|
tree: &mut Tree,
|
||||||
event: Event,
|
event: Event,
|
||||||
|
|
@ -254,7 +254,7 @@ where
|
||||||
let body_layout = if let Some(title_bar) = &mut self.title_bar {
|
let body_layout = if let Some(title_bar) = &mut self.title_bar {
|
||||||
let mut children = layout.children();
|
let mut children = layout.children();
|
||||||
|
|
||||||
title_bar.on_event(
|
title_bar.update(
|
||||||
&mut tree.children[1],
|
&mut tree.children[1],
|
||||||
event.clone(),
|
event.clone(),
|
||||||
children.next().unwrap(),
|
children.next().unwrap(),
|
||||||
|
|
|
||||||
|
|
@ -427,7 +427,7 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn on_event(
|
pub(crate) fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
tree: &mut Tree,
|
tree: &mut Tree,
|
||||||
event: Event,
|
event: Event,
|
||||||
|
|
|
||||||
|
|
@ -218,7 +218,7 @@ where
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_event(
|
fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
|
|
@ -227,9 +227,8 @@ where
|
||||||
clipboard: &mut dyn Clipboard,
|
clipboard: &mut dyn Clipboard,
|
||||||
shell: &mut Shell<'_, Message>,
|
shell: &mut Shell<'_, Message>,
|
||||||
) {
|
) {
|
||||||
self.content.on_event(
|
self.content
|
||||||
event, layout, cursor, renderer, clipboard, shell,
|
.update(event, layout, cursor, renderer, clipboard, shell);
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn operate(
|
fn operate(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue