From d8d75b4afa399767525f24fc896594b18ee87224 Mon Sep 17 00:00:00 2001
From: Pylogmon <pylogmon@outlook.com>
Date: Sun, 26 Nov 2023 18:35:21 +0800
Subject: [PATCH 1/2] feat: Config Tray Click Event

---
 src-tauri/src/config/verge.rs            |  4 ++++
 src-tauri/src/core/tray.rs               | 17 ++++++++++++-----
 src/components/setting/setting-verge.tsx | 21 +++++++++++++++++++--
 src/locales/en.json                      |  2 ++
 src/locales/ru.json                      |  2 ++
 src/locales/zh.json                      |  2 ++
 src/services/types.d.ts                  |  1 +
 7 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src-tauri/src/config/verge.rs b/src-tauri/src/config/verge.rs
index 961280e..f0c1969 100644
--- a/src-tauri/src/config/verge.rs
+++ b/src-tauri/src/config/verge.rs
@@ -23,6 +23,9 @@ pub struct IVerge {
     /// maybe be able to set the alpha
     pub theme_blur: Option<bool>,
 
+    /// tray click event
+    pub tray_event: Option<String>,
+
     /// enable traffic graph default is true
     pub traffic_graph: Option<bool>,
 
@@ -166,6 +169,7 @@ impl IVerge {
         patch!(language);
         patch!(theme_mode);
         patch!(theme_blur);
+        patch!(tray_event);
         patch!(traffic_graph);
         patch!(enable_memory_usage);
 
diff --git a/src-tauri/src/core/tray.rs b/src-tauri/src/core/tray.rs
index 01a5045..da0d890 100644
--- a/src-tauri/src/core/tray.rs
+++ b/src-tauri/src/core/tray.rs
@@ -145,9 +145,20 @@ impl Tray {
 
         Ok(())
     }
-
+    pub fn on_left_click(app_handle: &AppHandle) {
+        let tray_event = { Config::verge().latest().tray_event.clone() };
+        let tray_event = tray_event.unwrap_or("main_window".into());
+        println!("{tray_event}");
+        match tray_event.as_str() {
+            "system_proxy" => feat::toggle_system_proxy(),
+            "tun_mode" => feat::toggle_tun_mode(),
+            _ => resolve::create_window(app_handle),
+        }
+    }
     pub fn on_system_tray_event(app_handle: &AppHandle, event: SystemTrayEvent) {
         match event {
+            #[cfg(not(target_os = "linux"))]
+            SystemTrayEvent::LeftClick { .. } => Tray::on_left_click(app_handle),
             SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() {
                 mode @ ("rule_mode" | "global_mode" | "direct_mode" | "script_mode") => {
                     let mode = &mode[0..mode.len() - 5];
@@ -177,10 +188,6 @@ impl Tray {
                 }
                 _ => {}
             },
-            #[cfg(target_os = "windows")]
-            SystemTrayEvent::LeftClick { .. } => {
-                resolve::create_window(app_handle);
-            }
             _ => {}
         }
     }
diff --git a/src/components/setting/setting-verge.tsx b/src/components/setting/setting-verge.tsx
index d54094d..b0507f3 100644
--- a/src/components/setting/setting-verge.tsx
+++ b/src/components/setting/setting-verge.tsx
@@ -29,8 +29,7 @@ const SettingVerge = ({ onError }: Props) => {
   const { t } = useTranslation();
 
   const { verge, patchVerge, mutateVerge } = useVerge();
-  const { theme_mode, language } = verge ?? {};
-
+  const { theme_mode, language, tray_event } = verge ?? {};
   const configRef = useRef<DialogRef>(null);
   const hotkeyRef = useRef<DialogRef>(null);
   const miscRef = useRef<DialogRef>(null);
@@ -91,6 +90,24 @@ const SettingVerge = ({ onError }: Props) => {
         </GuardState>
       </SettingItem>
 
+      {OS !== "linux" && (
+        <SettingItem label={t("Tray Click Event")}>
+          <GuardState
+            value={tray_event ?? "main_window"}
+            onCatch={onError}
+            onFormat={(e: any) => e.target.value}
+            onChange={(e) => onChangeData({ tray_event: e })}
+            onGuard={(e) => patchVerge({ tray_event: e })}
+          >
+            <Select size="small" sx={{ width: 140, "> div": { py: "7.5px" } }}>
+              <MenuItem value="main_window">{t("Show Main Window")}</MenuItem>
+              <MenuItem value="system_proxy">{t("System Proxy")}</MenuItem>
+              <MenuItem value="tun_mode">{t("Tun Mode")}</MenuItem>
+            </Select>
+          </GuardState>
+        </SettingItem>
+      )}
+
       <SettingItem label={t("Theme Setting")}>
         <IconButton
           color="inherit"
diff --git a/src/locales/en.json b/src/locales/en.json
index fb6d1f5..3b76f13 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -85,6 +85,8 @@
   "Current System Proxy": "Current System Proxy",
   "Theme Mode": "Theme Mode",
   "Theme Blur": "Theme Blur",
+  "Tray Click Event": "Tray Click Event",
+  "Show Main Window": "Show Main Window",
   "Theme Setting": "Theme Setting",
   "Layout Setting": "Layout Setting",
   "Miscellaneous": "Miscellaneous",
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 1d20bf5..8ec5011 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -78,6 +78,8 @@
   "Current System Proxy": "Текущий системный прокси",
   "Theme Mode": "Режим темы",
   "Theme Blur": "Размытие темы",
+  "Tray Click Event": "Событие щелчка в лотке",
+  "Show Main Window": "Показать главное окно",
   "Theme Setting": "Настройка темы",
   "Hotkey Setting": "Настройка клавиатурных сокращений",
   "Traffic Graph": "График трафика",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 3ed39ea..55859a1 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -85,6 +85,8 @@
   "Bypass": "当前绕过：",
   "Theme Mode": "主题模式",
   "Theme Blur": "背景模糊",
+  "Tray Click Event": "托盘点击事件",
+  "Show Main Window": "显示主窗口",
   "Theme Setting": "主题设置",
   "Layout Setting": "界面设置",
   "Miscellaneous": "杂项设置",
diff --git a/src/services/types.d.ts b/src/services/types.d.ts
index 3fe2175..49429f7 100644
--- a/src/services/types.d.ts
+++ b/src/services/types.d.ts
@@ -155,6 +155,7 @@ interface IProfilesConfig {
 interface IVergeConfig {
   app_log_level?: "trace" | "debug" | "info" | "warn" | "error" | string;
   language?: string;
+  tray_event?: "main_window" | "system_proxy" | "tun_mode" | string;
   clash_core?: string;
   theme_mode?: "light" | "dark" | "system";
   theme_blur?: boolean;

From c0582fde665610cab4f69200dd880adb212d729a Mon Sep 17 00:00:00 2001
From: Pylogmon <pylogmon@outlook.com>
Date: Sun, 26 Nov 2023 18:49:48 +0800
Subject: [PATCH 2/2] chore: Remove Debug Info

---
 src-tauri/src/core/tray.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src-tauri/src/core/tray.rs b/src-tauri/src/core/tray.rs
index da0d890..3921f51 100644
--- a/src-tauri/src/core/tray.rs
+++ b/src-tauri/src/core/tray.rs
@@ -145,16 +145,17 @@ impl Tray {
 
         Ok(())
     }
+
     pub fn on_left_click(app_handle: &AppHandle) {
         let tray_event = { Config::verge().latest().tray_event.clone() };
         let tray_event = tray_event.unwrap_or("main_window".into());
-        println!("{tray_event}");
         match tray_event.as_str() {
             "system_proxy" => feat::toggle_system_proxy(),
             "tun_mode" => feat::toggle_tun_mode(),
             _ => resolve::create_window(app_handle),
         }
     }
+
     pub fn on_system_tray_event(app_handle: &AppHandle, event: SystemTrayEvent) {
         match event {
             #[cfg(not(target_os = "linux"))]