add Submenu::get and use PartialEq

tauri-apps · Aug 10, 2023 · 3fb8cf0 · 3fb8cf0
1 parent e30ffc5
commit 3fb8cf0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/core/tauri/src/menu/menu.rs b/core/tauri/src/menu/menu.rs
@@ -344,8 +344,11 @@ impl<R: Runtime> Menu<R> {
   }
 
   /// Retrieves the menu item matching the given identifier.
-  pub fn get<I: Into<MenuId>>(&self, id: I) -> Option<MenuItemKind<R>> {
-    let id = id.into();
+  pub fn get<'a, I>(&self, id: &'a I) -> Option<MenuItemKind<R>>
+  where
+    I: ?Sized,
+    MenuId: PartialEq<&'a I>,
+  {
     self
       .items()
       .unwrap_or_default()

diff --git a/core/tauri/src/menu/submenu.rs b/core/tauri/src/menu/submenu.rs
@@ -312,4 +312,17 @@ impl<R: Runtime> Submenu<R> {
     run_main_thread!(self, |self_: Self| self_.inner.set_as_help_menu_for_nsapp())?;
     Ok(())
   }
+
+  /// Retrieves the menu item matching the given identifier.
+  pub fn get<'a, I>(&self, id: &'a I) -> Option<MenuItemKind<R>>
+  where
+    I: ?Sized,
+    MenuId: PartialEq<&'a I>,
+  {
+    self
+      .items()
+      .unwrap_or_default()
+      .into_iter()
+      .find(|i| i.id() == &id)
+  }
 }