From 6832db788adeb7d39d229f5f114da21dde674104 Mon Sep 17 00:00:00 2001
From: Memory <134070804+Memory2314@users.noreply.github.com>
Date: Mon, 29 Sep 2025 23:16:06 +0800
Subject: [PATCH] feat: switch triggerMainWindow behavior

---
 src/main/index.ts                                | 14 ++++++++++----
 src/main/utils/template.ts                       |  3 ++-
 .../src/components/settings/general-config.tsx   | 16 +++++++++++++++-
 src/renderer/src/locales/en-US.json              |  3 +++
 src/renderer/src/locales/zh-CN.json              |  3 +++
 src/shared/types.d.ts                            |  1 +
 6 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/main/index.ts b/src/main/index.ts
index f2ca294..a9771d5 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -434,10 +434,16 @@ export async function createWindow(): Promise<void> {
 }
 
 export function triggerMainWindow(): void {
-  if (mainWindow?.isVisible()) {
-    closeMainWindow()
-  } else {
-    showMainWindow()
+  if (mainWindow) {
+    getAppConfig()
+    .then(({ triggerMainWindowBehavior = 'show' }) => {
+      if (triggerMainWindowBehavior === 'toggle' && mainWindow?.isVisible()) {
+        closeMainWindow()
+      } else {
+        showMainWindow()
+      }
+    })
+    .catch(showMainWindow)
   }
 }
 
diff --git a/src/main/utils/template.ts b/src/main/utils/template.ts
index e0f5832..9e5156f 100644
--- a/src/main/utils/template.ts
+++ b/src/main/utils/template.ts
@@ -46,7 +46,8 @@ export const defaultConfig: IAppConfig = {
     'substore'
   ],
   siderWidth: 250,
-  sysProxy: { enable: false, mode: 'manual' }
+  sysProxy: { enable: false, mode: 'manual' },
+  triggerMainWindowBehavior: 'show' // 添加默认值
 }
 
 export const defaultControledMihomoConfig: Partial<IMihomoConfig> = {
diff --git a/src/renderer/src/components/settings/general-config.tsx b/src/renderer/src/components/settings/general-config.tsx
index 30d1c2c..252dabc 100644
--- a/src/renderer/src/components/settings/general-config.tsx
+++ b/src/renderer/src/components/settings/general-config.tsx
@@ -63,7 +63,8 @@ const GeneralConfig: React.FC = () => {
     envType = [platform === 'win32' ? 'powershell' : 'bash'],
     autoCheckUpdate,
     appTheme = 'system',
-    language = 'zh-CN'
+    language = 'zh-CN',
+    triggerMainWindowBehavior = 'show' // 添加这一行
   } = appConfig || {}
 
   useEffect(() => {
@@ -398,6 +399,19 @@ const GeneralConfig: React.FC = () => {
             }}
           />
         </SettingItem>
+        <SettingItem title={t('settings.triggerMainWindowBehavior')} divider>
+          <Tabs
+            size="sm"
+            color="primary"
+            selectedKey={triggerMainWindowBehavior}
+            onSelectionChange={(key) => {
+              patchAppConfig({ triggerMainWindowBehavior: key as 'show' | 'toggle' })
+            }}
+          >
+            <Tab key="show" title={t('settings.triggerMainWindowBehaviorShow')} />
+            <Tab key="toggle" title={t('settings.triggerMainWindowBehaviorToggle')} />
+          </Tabs>
+        </SettingItem>
         <SettingItem
           title={t('settings.disableHardwareAcceleration')}
           actions={
diff --git a/src/renderer/src/locales/en-US.json b/src/renderer/src/locales/en-US.json
index 1863565..03808e8 100644
--- a/src/renderer/src/locales/en-US.json
+++ b/src/renderer/src/locales/en-US.json
@@ -71,6 +71,9 @@
   "settings.showTraffic_mac": "Show Network Speed in Status Bar",
   "settings.showDockIcon": "Show Dock Icon",
   "settings.useWindowFrame": "Use System Title Bar",
+  "settings.triggerMainWindowBehavior": "Window Trigger Behavior",
+  "settings.triggerMainWindowBehaviorShow": "Always Show",
+  "settings.triggerMainWindowBehaviorToggle": "Toggle Show/Hide",
   "settings.disableHardwareAcceleration": "Disable Hardware Acceleration",
   "settings.disableHardwareAccelerationTooltip": "Disabling hardware acceleration can resolve rendering issues or crashes caused by graphics driver problems, but may reduce performance. Requires app restart to take effect",
   "settings.hardwareAcceleration.confirm.title": "Confirm App Restart",
diff --git a/src/renderer/src/locales/zh-CN.json b/src/renderer/src/locales/zh-CN.json
index 13ca959..081fc0c 100644
--- a/src/renderer/src/locales/zh-CN.json
+++ b/src/renderer/src/locales/zh-CN.json
@@ -71,6 +71,9 @@
   "settings.showTraffic_mac": "在状态栏显示网速",
   "settings.showDockIcon": "显示 Dock 图标",
   "settings.useWindowFrame": "使用系统标题栏",
+  "settings.triggerMainWindowBehavior": "窗口触发行为",
+  "settings.triggerMainWindowBehaviorShow": "总是显示",
+  "settings.triggerMainWindowBehaviorToggle": "切换显示/隐藏",
   "settings.disableHardwareAcceleration": "禁用硬件加速",
   "settings.disableHardwareAccelerationTooltip": "禁用硬件加速可以解决某些显卡驱动问题导致的渲染异常或崩溃，但可能会降低性能。修改后需要重启应用生效",
   "settings.hardwareAcceleration.confirm.title": "确认重启应用",
diff --git a/src/shared/types.d.ts b/src/shared/types.d.ts
index 43739fa..2bda9eb 100644
--- a/src/shared/types.d.ts
+++ b/src/shared/types.d.ts
@@ -309,6 +309,7 @@ interface IAppConfig {
   restartAppShortcut?: string
   quitWithoutCoreShortcut?: string
   language?: 'zh-CN' | 'en-US' | 'ru-RU' | 'fa-IR'
+  triggerMainWindowBehavior?: 'show' | 'toggle'
 }
 
 interface IMihomoTunConfig {