托盘和窗口优化

xianyunleo · Feb 1, 2024 · 379c9a1 · 379c9a1
1 parent 383e48e
commit 379c9a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/MainWindow.js b/src/main/MainWindow.js
@@ -23,8 +23,7 @@ export default class MainWindow {
     }
 
     static show() {
-        if (this.#instance.isMinimized()) this.#instance.restore()
-        this.#instance.show()
+        this.#instance.isMinimized() ? this.#instance.restore() : this.#instance.show()
     }
 
 }
diff --git a/src/main/TrayManage.js b/src/main/TrayManage.js
@@ -1,7 +1,7 @@
 import { electronRequireMulti } from '@/main/utils/electron'
 import { APP_NAME } from '@/shared/utils/constant'
 const { app, Tray, Menu, nativeImage, getGlobal } = electronRequireMulti()
-import { isMacOS } from '@/main/utils/utils'
+import { isMacOS, isWindows } from '@/main/utils/utils'
 import {t}  from '@/shared/utils/i18n'
 import Path from '@/main/utils/Path'
 import GetAppPath from '@/main/utils/GetAppPath'
@@ -16,7 +16,9 @@ export default class TrayManage {
         const contextMenu = this.getContextMenu();
         tray.setToolTip(APP_NAME)
         tray.setContextMenu(contextMenu)
-        tray.on('click', () => this.showMainWindow())
+        if (isWindows) {
+            tray.on('click', () => this.showMainWindow())
+        }
         this.#_instance = tray;
     }