From e067c03e89d754cfd950d29efd207a395e691f89 Mon Sep 17 00:00:00 2001
From: wallace5303 <530353222@qq.com>
Date: Thu, 14 Apr 2022 16:47:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=AD=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/library/tray.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/electron/library/tray.js b/electron/library/tray.js
index b7aa00c..00c066e 100644
--- a/electron/library/tray.js
+++ b/electron/library/tray.js
@@ -38,11 +38,14 @@ module.exports = {
   
     // 点击关闭，最小化到托盘
     mainWindow.on('close', (event) => {
+      if (eeApp.electron.extra.closeWindow == true) {
+        return;
+      }
       mainWindow.hide();
       //mainWindow.setSkipTaskbar(true); 
       event.preventDefault();
     });
-    mainWindow.show();
+    // mainWindow.show();
 
     // 测试发现：创建的Tray对象实例变量和app.whenReady()在同一模块中定义才行
     // 赋值给eeApp.electron.tray，已在框架ee-core包中定义
@@ -56,14 +59,14 @@ module.exports = {
     appTray.setContextMenu(contextMenu);
   
     // 监听 显示/隐藏
-    appTray.on('click', function(){
-      if (mainWindow.isVisible()) {
-        mainWindow.hide();
-        //mainWindow.setSkipTaskbar(true);
-      } else {
-        mainWindow.show();
-        //mainWindow.setSkipTaskbar(false);
-      }
-    });
+    // appTray.on('click', function(){
+    //   if (mainWindow.isVisible()) {
+    //     mainWindow.hide();
+    //     //mainWindow.setSkipTaskbar(true);
+    //   } else {
+    //     mainWindow.show();
+    //     //mainWindow.setSkipTaskbar(false);
+    //   }
+    // });
   }
 }