SDA-4865 - Fix screen picker window focus issue (#2367)

* SDA-4865 - Fix focus issue

* SDA-4865 - Close existing indicator

* SDA-4865 - Move top on focus

* SDA-4865 - Set always on top on focus

* SDA-4865 - Set always on top on select screen

Author: KiranNiranjan

src/app/display-media-request-handler.ts

@@ -1,10 +1,4 @@
-import {
-  BaseWindow,
-  BrowserWindow,
-  desktopCapturer,
-  ipcMain,
-  session,
-} from 'electron';
+import { BrowserWindow, desktopCapturer, ipcMain, session } from 'electron';
 import { NOTIFICATION_WINDOW_TITLE } from '../common/api-interface';
 import { isDevEnv, isMac, isWindowsOS } from '../common/env';
 import { logger } from '../common/logger';
@@ -48,7 +42,6 @@ class DisplayMediaRequestHandler {
             width: 580,
             show: false,
             fullscreenable: false,
-            parent: windowHandler.getMainWindow() as BaseWindow,
           },
           { devTools: isDevEnv },
         );
@@ -57,11 +50,7 @@ class DisplayMediaRequestHandler {
           'screen-picker',
           browserWindowOptions,
         );
-
-        this.screenPickerWindow.on('blur', () => {
-          this.screenPickerWindow?.setAlwaysOnTop(true);
-          this.screenPickerWindow?.focus();
-        });
+        windowHandler.moveWindow(this.screenPickerWindow);
 
         this.screenPickerWindow.on('closed', () => {
           this.screenPickerWindow = null;
@@ -78,6 +67,16 @@ class DisplayMediaRequestHandler {
           }
         });
 
+        this.screenPickerWindow.on('focus', () => {
+          if (
+            this.screenPickerWindow &&
+            windowExists(this.screenPickerWindow)
+          ) {
+            this.screenPickerWindow.setAlwaysOnTop(true);
+            this.screenPickerWindow.moveTop();
+          }
+        });
+
         this.screenPickerWindow.webContents.once('did-finish-load', () => {
           if (!this.screenPickerWindow) {
             return;
@@ -94,8 +93,19 @@ class DisplayMediaRequestHandler {
         mainWebContents.send('screen-picker-data', updatedSources);
 
         ipcMain.on('screen-source-select', (_event, source) => {
-          if (source) {
-            windowHandler.drawScreenShareIndicatorFrame(source);
+          if (source != null) {
+            windowHandler.closeScreenSharingIndicator();
+            const timeoutValue = 300;
+            setTimeout(() => {
+              windowHandler.drawScreenShareIndicatorFrame(source);
+              if (
+                this.screenPickerWindow &&
+                windowExists(this.screenPickerWindow)
+              ) {
+                this.screenPickerWindow.setAlwaysOnTop(true);
+                this.screenPickerWindow.moveTop();
+              }
+            }, timeoutValue);
           }
           logger.info('display-media-request-handler: source selected', source);
         });