From e94056941a1805d27ade1e405f1d6b36d6ba88b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Fri, 20 Sep 2024 13:59:09 +0800
Subject: [PATCH] =?UTF-8?q?optimize:=20=E4=BC=98=E5=8C=96=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E9=94=AE=E6=98=BE=E7=A4=BA/=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=BD=93=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E6=89=93=E5=BC=80=E7=9D=80=E4=BD=86=E6=9C=AA=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=84=A6=E7=82=B9=E6=97=B6=EF=BC=8C=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E9=94=AE=E5=8F=AF=E8=8E=B7=E5=8F=96=E7=AA=97=E5=8F=A3=E7=84=A6?=
 =?UTF-8?q?=E7=82=B9=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/gui/src/background.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/gui/src/background.js b/packages/gui/src/background.js
index 6277aba..b8e524e 100644
--- a/packages/gui/src/background.js
+++ b/packages/gui/src/background.js
@@ -285,8 +285,13 @@ function initApp () {
     globalShortcut.unregisterAll()
     if (DevSidecar.api.config.get().app.showHideShortcut) {
       globalShortcut.register(DevSidecar.api.config.get().app.showHideShortcut, () => {
-        if (winIsHidden) {
-          showWin()
+        if (winIsHidden || !win.isFocused()) {
+          if (!win.isFocused()) {
+            win.focus()
+          }
+          if (winIsHidden) {
+            showWin()
+          }
         } else {
           // linux，快捷键不关闭窗口
           if (!isLinux()) {