From d1b7c4585d25f657e24dbf2ab6b108732091aef0 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Wed, 4 Dec 2019 13:51:50 +0900
Subject: [PATCH] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20[17?=
 =?UTF-8?q?=20=EC=B5=9C=EC=86=8C=ED=99=94=20=EC=84=A0=ED=83=9D=20=EC=8B=9C?=
 =?UTF-8?q?=20=EC=9E=91=EC=97=85=ED=91=9C=EC=8B=9C=EC=A4=84=EC=97=90=20?=
 =?UTF-8?q?=EB=A9=94=EC=8B=A0=EC=A0=80=20=EC=95=88=EB=B3=B4=EC=9E=84]=20::?=
 =?UTF-8?q?=20=EC=B5=9C=EC=86=8C=ED=99=94=EC=8B=9C=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=EC=A4=84=EC=97=90=20=EB=B3=B4=EC=9D=B4?=
 =?UTF-8?q?=EA=B3=A0,=20=EB=8B=AB=EA=B8=B0=20=EB=B2=84=ED=8A=BC=EC=8B=9C?=
 =?UTF-8?q?=20=EC=9E=91=EC=97=85=ED=9A=A8=EC=8B=9C=EC=A4=84=EC=97=90=20?=
 =?UTF-8?q?=EC=97=86=EC=96=B4=EC=A7=80=EB=A9=B0=20tray=20=EC=97=90?=
 =?UTF-8?q?=EB=A7=8C=20=ED=91=9C=EC=8B=9C=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

노티 발생시 작업표시줄에 깜빡이도록 기능 추가.
---
 .../src/lib/types/channel.type.ts                  |  3 ++-
 .../src/app/AppWindow.ts                           | 14 +++++++++-----
 .../ucap-webmessenger-electron/src/index.ts        |  4 ++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/electron-projects/ucap-webmessenger-electron-core/src/lib/types/channel.type.ts b/electron-projects/ucap-webmessenger-electron-core/src/lib/types/channel.type.ts
index aab87d73..d9f55c52 100644
--- a/electron-projects/ucap-webmessenger-electron-core/src/lib/types/channel.type.ts
+++ b/electron-projects/ucap-webmessenger-electron-core/src/lib/types/channel.type.ts
@@ -26,7 +26,8 @@ export enum ElectronBrowserWindowChannel {
   Show = 'show',
   Close = 'close',
   Closed = 'closed',
-  ReadyToShow = 'ready-to-show'
+  ReadyToShow = 'ready-to-show',
+  Focus = 'focus'
 }
 
 export enum ElectronWebContentsChannel {
diff --git a/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts b/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
index db325595..ab45380d 100644
--- a/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
+++ b/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
@@ -65,7 +65,7 @@ export class AppWindow {
     this.window = new BrowserWindow(windowOptions);
     savedWindowState.manage(this.window);
 
-    let quitting = false;
+    let quitting = true;
     app.on(ElectronAppChannel.BeforeQuit, () => {
       quitting = true;
     });
@@ -92,10 +92,14 @@ export class AppWindow {
         }
       });
       this.window.on(ElectronBrowserWindowChannel.Close, e => {
-        if (!quitting) {
-          e.preventDefault();
-          this.window.hide();
-        }
+        // if (!quitting) {
+        e.preventDefault();
+        this.window.hide();
+        // }
+      });
+      this.window.on(ElectronBrowserWindowChannel.Focus, e => {
+        console.log(e);
+        this.window.flashFrame(false);
       });
     }
 
diff --git a/electron-projects/ucap-webmessenger-electron/src/index.ts b/electron-projects/ucap-webmessenger-electron/src/index.ts
index b5c5bf95..cc623dac 100644
--- a/electron-projects/ucap-webmessenger-electron/src/index.ts
+++ b/electron-projects/ucap-webmessenger-electron/src/index.ts
@@ -350,6 +350,7 @@ ipcMain.on(
           )
         : '',
       onClick: e => {
+        appWindow.browserWindow.flashFrame(false);
         appWindow.browserWindow.webContents.send(
           ChatChannel.OpenRoom,
           noti.roomSeq
@@ -358,12 +359,15 @@ ipcMain.on(
         e.close();
       }
     });
+
+    appWindow.browserWindow.flashFrame(true);
   }
 );
 
 ipcMain.on(
   NotificationChannel.CloseAllNotify,
   (event: IpcMainEvent, ...args: any[]) => {
+    appWindow.browserWindow.flashFrame(false);
     console.log('Channel.closeAllNotify', args);
   }
 );