From 70130675825c8cd0e7b4851e95bfcb0827833d4e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 22 Dec 2023 15:25:01 -0700 Subject: [PATCH] Fix context menu remaining open some more --- src/menu.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/menu.rs b/src/menu.rs index 7f80544..9131576 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -29,21 +29,17 @@ macro_rules! menu_button { } pub fn context_menu<'a>(entity: segmented_button::Entity) -> Element<'a, Message> { - let menu_message = |label, message| menu_button!(widget::text(label)).on_press(message); - - let menu_action = - |label, action| menu_message(label, Message::TabContextAction(entity, action)); + let menu_action = |label, action| { + menu_button!(widget::text(label)).on_press(Message::TabContextAction(entity, action)) + }; widget::container(column!( menu_action(fl!("copy"), Action::Copy), menu_action(fl!("paste"), Action::Paste), menu_action(fl!("select-all"), Action::SelectAll), horizontal_rule(1), - menu_message(fl!("new-tab"), Message::TabNew), - menu_message( - fl!("settings"), - Message::ToggleContextPage(ContextPage::Settings) - ), + menu_action(fl!("new-tab"), Action::TabNew), + menu_action(fl!("settings"), Action::Settings), )) .padding(1) //TODO: move style to libcosmic