diff --git a/src/widget/menu/action.rs b/src/widget/menu/action.rs index 94da863..25ac538 100644 --- a/src/widget/menu/action.rs +++ b/src/widget/menu/action.rs @@ -31,7 +31,7 @@ use crate::widget::segmented_button::Entity; /// impl MenuAction for MyAction { /// type Message = MyMessage; /// -/// fn message(&self, entity: Option) -> Self::Message { +/// fn message(&self) -> Self::Message { /// match self { /// MyAction::Open => MyMessage::Open, /// MyAction::Save => MyMessage::Save, @@ -46,12 +46,8 @@ pub trait MenuAction: Clone + Copy + Eq + PartialEq { /// Returns a message of type `Self::Message` when the action is triggered. /// - /// # Arguments - /// - /// * `entity` - An optional `Entity` that may be associated with the action. - /// /// # Returns /// /// * `Self::Message` - The message that is produced when the action is triggered. - fn message(&self, entity: Option) -> Self::Message; + fn message(&self) -> Self::Message; } diff --git a/src/widget/menu/menu_tree.rs b/src/widget/menu/menu_tree.rs index 51870c9..56715f7 100644 --- a/src/widget/menu/menu_tree.rs +++ b/src/widget/menu/menu_tree.rs @@ -225,7 +225,7 @@ where Element<'a, Message, crate::Theme, Renderer>: From>, { fn find_key(action: &A, key_binds: &HashMap) -> String { - for (key_bind, key_action) in key_binds.iter() { + for (key_bind, key_action) in key_binds { if action == key_action { return key_bind.to_string(); } @@ -248,12 +248,12 @@ where widget::horizontal_space(Length::Fill), widget::text(key), ) - .on_press(action.message(None)); + .on_press(action.message()); trees.push(MenuTree::::new(menu_button)); } MenuItem::CheckBox(label, value, action) => { - let key = find_key(&action, &key_binds); + let key = find_key(&action, key_binds); trees.push(MenuTree::new( menu_button!( if value { @@ -267,7 +267,7 @@ where widget::horizontal_space(Length::Fill), widget::text(key) ) - .on_press(action.message(None)), + .on_press(action.message()), )); } MenuItem::Folder(label, children) => {