Skip to content

Commit 946efdd

Browse files
committed
fix (core): 修复编辑器无法使用快捷键问题
1 parent 777edc1 commit 946efdd

6 files changed

Lines changed: 20 additions & 4 deletions

File tree

src-tauri/icons/128x128.png

-2.76 KB
Loading

src-tauri/icons/32x32.png

-40 Bytes
Loading

src-tauri/icons/icon.icns

-103 KB
Binary file not shown.

src-tauri/icons/icon.ico

-5.76 KB
Binary file not shown.

src-tauri/icons/icon.png

-47.5 KB
Loading

src-tauri/src/setup/menu.rs

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,42 @@
11
use tauri::{
22
AppHandle, Emitter,
3-
menu::{Menu, MenuBuilder, MenuItemBuilder, SubmenuBuilder},
3+
menu::{Menu, MenuBuilder, MenuItemBuilder, PredefinedMenuItem, SubmenuBuilder},
44
};
55

66
pub fn create_menu(app: &AppHandle) -> tauri::Result<Menu<tauri::Wry>> {
77
let about_item = MenuItemBuilder::new("关于 CodeForge")
88
.id("about")
99
.build(app)?;
1010

11+
// 应用菜单
1112
let app_submenu = SubmenuBuilder::new(app, "CodeForge")
1213
.item(&about_item)
1314
.build()?;
1415

15-
let menu = MenuBuilder::new(app).items(&[&app_submenu]).build()?;
16+
// 编辑菜单
17+
let edit_submenu = SubmenuBuilder::new(app, "编辑")
18+
.item(&PredefinedMenuItem::undo(app, Option::from("撤销"))?)
19+
.item(&PredefinedMenuItem::redo(app, Option::from("重做"))?)
20+
.separator()
21+
.item(&PredefinedMenuItem::cut(app, Option::from("剪切"))?)
22+
.item(&PredefinedMenuItem::copy(app, Option::from("复制"))?)
23+
.item(&PredefinedMenuItem::paste(app, Option::from("粘贴"))?)
24+
.separator()
25+
.item(&PredefinedMenuItem::select_all(app, Option::from("全选"))?)
26+
.build()?;
27+
28+
let menu = MenuBuilder::new(app)
29+
.items(&[&app_submenu, &edit_submenu])
30+
.build()?;
1631

1732
Ok(menu)
1833
}
1934

2035
pub fn setup_menu_handler(app: &AppHandle) {
21-
app.on_menu_event(move |app, event| {
22-
if event.id().as_ref() == "about" {
36+
app.on_menu_event(move |app, event| match event.id().as_ref() {
37+
"about" => {
2338
let _event = app.emit("show-about", ());
2439
}
40+
_ => {}
2541
});
2642
}

0 commit comments

Comments
 (0)