|
@@ -536,19 +536,19 @@ fn insert<R: Runtime>(
|
|
|
#[command(root = "crate")]
|
|
|
fn remove<R: Runtime>(
|
|
|
app: AppHandle<R>,
|
|
|
- menu_rid: ResourceId,
|
|
|
- menu_kind: ItemKind,
|
|
|
+ rid: ResourceId,
|
|
|
+ kind: ItemKind,
|
|
|
item: (ResourceId, ItemKind),
|
|
|
) -> crate::Result<()> {
|
|
|
let resources_table = app.resources_table();
|
|
|
let (rid, kind) = item;
|
|
|
- match menu_kind {
|
|
|
+ match kind {
|
|
|
ItemKind::Menu => {
|
|
|
- let menu = resources_table.get::<Menu<R>>(menu_rid)?;
|
|
|
+ let menu = resources_table.get::<Menu<R>>(rid)?;
|
|
|
do_menu_item!(resources_table, rid, kind, |i| menu.remove(&*i))?;
|
|
|
}
|
|
|
ItemKind::Submenu => {
|
|
|
- let submenu = resources_table.get::<Submenu<R>>(menu_rid)?;
|
|
|
+ let submenu = resources_table.get::<Submenu<R>>(rid)?;
|
|
|
do_menu_item!(resources_table, rid, kind, |i| submenu.remove(&*i))?;
|
|
|
}
|
|
|
_ => return Err(anyhow::anyhow!("unexpected menu item kind").into()),
|