From 09ea979cf791adb9234a925ec6a625178daef4a7 Mon Sep 17 00:00:00 2001
From: AetherWing <aoxiangtianyu_go@qq.com>
Date: Sun, 1 Mar 2026 17:13:42 +0800
Subject: [PATCH] chore: tray hotkey (#6373)

---
 Changelog.md                   | 1 +
 src-tauri/src/core/tray/mod.rs | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index fc3e9c446..304ef09f0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,5 +19,6 @@
 - 隐藏日志中的订阅信息
 - 优化部分界面文案文本
 - 优化切换节点时的延迟
+- 优化托盘退出快捷键显示
 
 </details>
diff --git a/src-tauri/src/core/tray/mod.rs b/src-tauri/src/core/tray/mod.rs
index e13abd39f..86b8fdf21 100644
--- a/src-tauri/src/core/tray/mod.rs
+++ b/src-tauri/src/core/tray/mod.rs
@@ -834,7 +834,12 @@ async fn create_tray_menu(
         ],
     )?;
 
-    let quit = &MenuItem::with_id(app_handle, MenuIds::EXIT, &texts.exit, true, Some("CmdOrControl+Q"))?;
+    let quit_accelerator = hotkeys.get("quit").map(|s| s.as_str());
+
+    #[cfg(target_os = "macos")]
+    let quit_accelerator = quit_accelerator.or(Some("Cmd+Q"));
+
+    let quit = &MenuItem::with_id(app_handle, MenuIds::EXIT, &texts.exit, true, quit_accelerator)?;
 
     let separator = &PredefinedMenuItem::separator(app_handle)?;