diff --git a/src-tauri/icons/tray/macos/statusTemplate.png b/src-tauri/icons/tray/macos/statusTemplate.png new file mode 100644 index 0000000..e51224e Binary files /dev/null and b/src-tauri/icons/tray/macos/statusTemplate.png differ diff --git a/src-tauri/icons/tray/macos/statusTemplate@2x.png b/src-tauri/icons/tray/macos/statusTemplate@2x.png new file mode 100644 index 0000000..09cc0aa Binary files /dev/null and b/src-tauri/icons/tray/macos/statusTemplate@2x.png differ diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 73d13e9..2abb254 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -9,7 +9,7 @@ mod store; use store::AppState; use tauri::{ menu::{CheckMenuItem, Menu, MenuBuilder, MenuItem}, - tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent}, + tray::{TrayIconBuilder, TrayIconEvent}, }; use tauri::{Emitter, Manager}; @@ -312,7 +312,8 @@ pub fn run() { // 创建动态托盘菜单 let menu = create_tray_menu(&app.handle(), &app_state)?; - let _tray = TrayIconBuilder::with_id("main") + // 构建托盘 + let mut tray_builder = TrayIconBuilder::with_id("main") .on_tray_icon_event(|_tray, event| match event { // 左键点击已通过 show_menu_on_left_click(true) 打开菜单,这里不再额外处理 TrayIconEvent::Click { .. } => {} @@ -322,9 +323,12 @@ pub fn run() { .on_menu_event(|app, event| { handle_tray_menu_event(app, &event.id.0); }) - .icon(app.default_window_icon().unwrap().clone()) - .show_menu_on_left_click(true) - .build(app)?; + .show_menu_on_left_click(true); + + // 统一使用应用默认图标;待托盘模板图标就绪后再启用 + tray_builder = tray_builder.icon(app.default_window_icon().unwrap().clone()); + + let _tray = tray_builder.build(app)?; // 将同一个实例注入到全局状态,避免重复创建导致的不一致 app.manage(app_state); Ok(())