From 110db561a998f00c39ba3fa79a5e363521d54c06 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Tue, 16 Jan 2024 13:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=80=E5=B0=8F=E5=8C=96?=
 =?UTF-8?q?=E5=90=8E=E5=86=8D=E9=9A=90=E8=97=8F=E7=AA=97=E5=8F=A3=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=89=98=E7=9B=98=E8=8F=9C=E5=8D=95=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=8A=9F=E8=83=BD=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md             |  1 +
 src/main/modules/winMain/main.ts | 23 +++++++----------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 51ba9223..981ca18f 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -31,6 +31,7 @@
 - 修复 MacOS 平台在 Finder 打开文件或目录时应用卡死的问题（#1684）
 - 修复下载模块在数据写入速度较慢的情况下出现任务及文件异常的问题
 - 修复临时列表变更会意外触发同步的问题
+- 修复最小化后再隐藏窗口时，托盘菜单的显示主界面功能异常的问题
 
 ### 其他
 
diff --git a/src/main/modules/winMain/main.ts b/src/main/modules/winMain/main.ts
index 1f1df9f2..f9988466 100644
--- a/src/main/modules/winMain/main.ts
+++ b/src/main/modules/winMain/main.ts
@@ -165,26 +165,17 @@ export const toggleHide = () => {
 }
 export const toggleMinimize = () => {
   if (!browserWindow) return
-  if (browserWindow.isMinimized()) {
-    if (!browserWindow.isVisible()) {
-      browserWindow.show()
-    }
-    browserWindow.restore()
-    browserWindow.focus()
-  } else {
-    browserWindow.minimize()
-  }
+  if (browserWindow.isVisible()) {
+    if (browserWindow.isMinimized()) browserWindow.restore()
+    else browserWindow.minimize()
+  } else browserWindow.show()
 }
 export const showWindow = () => {
   if (!browserWindow) return
-  if (browserWindow.isMinimized()) {
-    browserWindow.restore()
-  }
   if (browserWindow.isVisible()) {
-    browserWindow.focus()
-  } else {
-    browserWindow.show()
-  }
+    if (browserWindow.isMinimized()) browserWindow.restore()
+    else browserWindow.focus()
+  } else browserWindow.show()
 }
 export const hideWindow = () => {
   if (!browserWindow) return