me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename PickList handlers for consistency

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-02-06 00:03:23 +01:00
parent 6cf7c4645d
commit 59a79e55d4
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

50
widget/src/pick_list.rs
View file

@ -34,9 +34,9 @@ pub struct PickList<
Theme: StyleSheet, Theme: StyleSheet,
Renderer: text::Renderer, Renderer: text::Renderer,
{ {
on_selected: Box<dyn Fn(T) -> Message + 'a>, on_select: Box<dyn Fn(T) -> Message + 'a>,
on_opened: Option<Message>, on_open: Option<Message>,
on_closed: Option<Message>, on_close: Option<Message>,
options: Cow<'a, [T]>, options: Cow<'a, [T]>,
placeholder: Option<String>, placeholder: Option<String>,
selected: Option<T>, selected: Option<T>,
@ -71,12 +71,12 @@ where
pub fn new( pub fn new(
options: impl Into<Cow<'a, [T]>>, options: impl Into<Cow<'a, [T]>>,
selected: Option<T>, selected: Option<T>,
on_selected: impl Fn(T) -> Message + 'a, on_select: impl Fn(T) -> Message + 'a,
) -> Self { ) -> Self {
Self { Self {
on_selected: Box::new(on_selected), on_select: Box::new(on_select),
on_opened: None, on_open: None,
on_closed: None, on_close: None,
options: options.into(), options: options.into(),
placeholder: None, placeholder: None,
selected, selected,
@ -142,15 +142,15 @@ where
self self
} }
/// Sets the message that will be produced when the [`PickList`] Menu is openned menu. /// Sets the message that will be produced when the [`PickList`] is opened.
pub fn on_opened(mut self, msg: Message) -> Self { pub fn on_open(mut self, on_open: Message) -> Self {
self.on_opened = Some(msg); self.on_open = Some(on_open);
self self
} }
/// Sets the message that will be produced when the [`PickList`] Menu is closed menu. /// Sets the message that will be produced when the [`PickList`] is closed.
pub fn on_closed(mut self, msg: Message) -> Self { pub fn on_close(mut self, on_close: Message) -> Self {
self.on_closed = Some(msg); self.on_close = Some(on_close);
self self
} }
@ -229,9 +229,9 @@ where
layout, layout,
cursor, cursor,
shell, shell,
self.on_selected.as_ref(), self.on_select.as_ref(),
self.on_opened.as_ref(), self.on_open.as_ref(),
self.on_closed.as_ref(), self.on_close.as_ref(),
self.selected.as_ref(), self.selected.as_ref(),
&self.options, &self.options,
|| tree.state.downcast_mut::<State<Renderer::Paragraph>>(), || tree.state.downcast_mut::<State<Renderer::Paragraph>>(),
@ -297,7 +297,7 @@ where
self.text_shaping, self.text_shaping,
self.font.unwrap_or_else(|| renderer.default_font()), self.font.unwrap_or_else(|| renderer.default_font()),
&self.options, &self.options,
&self.on_selected, &self.on_select,
self.style.clone(), self.style.clone(),
) )
} }
@ -492,9 +492,9 @@ pub fn update<'a, T, P, Message>(
layout: Layout<'_>, layout: Layout<'_>,
cursor: mouse::Cursor, cursor: mouse::Cursor,
shell: &mut Shell<'_, Message>, shell: &mut Shell<'_, Message>,
on_selected: &dyn Fn(T) -> Message, on_select: &dyn Fn(T) -> Message,
on_opened: Option<&Message>, on_open: Option<&Message>,
on_closed: Option<&Message>, on_close: Option<&Message>,
selected: Option<&T>, selected: Option<&T>,
options: &[T], options: &[T],
state: impl FnOnce() -> &'a mut State<P>, state: impl FnOnce() -> &'a mut State<P>,
@ -514,8 +514,8 @@ where
// bounds or on the drop-down, either way we close the overlay. // bounds or on the drop-down, either way we close the overlay.
state.is_open = false; state.is_open = false;
if let Some(on_closed) = on_closed { if let Some(on_close) = on_close {
shell.publish(on_closed.clone()); shell.publish(on_close.clone());
} }
event::Status::Captured event::Status::Captured
@ -524,8 +524,8 @@ where
state.hovered_option = state.hovered_option =
options.iter().position(|option| Some(option) == selected); options.iter().position(|option| Some(option) == selected);
if let Some(on_opened) = on_opened { if let Some(on_open) = on_open {
shell.publish(on_opened.clone()); shell.publish(on_open.clone());
} }
event::Status::Captured event::Status::Captured
@ -568,7 +568,7 @@ where
}; };
if let Some(next_option) = next_option { if let Some(next_option) = next_option {
shell.publish((on_selected)(next_option.clone())); shell.publish((on_select)(next_option.clone()));
} }
event::Status::Captured event::Status::Captured