From 06368d8e7b5a35ec3184b3ed61a489aa0471b689 Mon Sep 17 00:00:00 2001
From: Kiran Niranjan <kiran.niranjan@symphony.com>
Date: Thu, 14 Dec 2023 13:41:38 +0530
Subject: [PATCH] SDA-4417 - Move focus listener outside did-finish-load and
 use window property instead of config for AlwaysOnTop (#2031)

---
 src/app/window-handler.ts | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts
index c15fe145..5d5c7cd0 100644
--- a/src/app/window-handler.ts
+++ b/src/app/window-handler.ts
@@ -638,20 +638,18 @@ export class WindowHandler {
           MAIN_WEB_CONTENTS_EVENTS,
           this.mainWebContents,
         );
+      }
+    });
 
-        // workaround for https://perzoinc.atlassian.net/browse/SDA-4251
-        this.mainWindow?.on('focus', () => {
-          const { alwaysOnTop } = config.getConfigFields(['alwaysOnTop']);
-          logger.info('window-handler: main window focused', alwaysOnTop);
-          if (
-            alwaysOnTop === CloudConfigDataTypes.ENABLED &&
-            this.mainWindow &&
-            windowExists(this.mainWindow)
-          ) {
-            this.mainWindow.setAlwaysOnTop(false);
-            this.mainWindow.setAlwaysOnTop(true);
-          }
-        });
+    // workaround for https://perzoinc.atlassian.net/browse/SDA-4251
+    this.mainWindow?.on('focus', () => {
+      if (
+        this.mainWindow &&
+        windowExists(this.mainWindow) &&
+        this.mainWindow.isAlwaysOnTop()
+      ) {
+        this.mainWindow.setAlwaysOnTop(false);
+        this.mainWindow.setAlwaysOnTop(true);
       }
     });