SDA-4452 Focus on current window after taking a screenshot (finos#2077)

* SDA-4422 Bug - Workaroud for frameless transparent windows titlebar being displayed * SDA-4452 Focus on current window after taking a screenshot * SDA-4452 Focus on current window after cancelling screenshot
sbenmoussati · Jan 16, 2024 · 0bb3f14 · 0bb3f14
1 parent bafe626
commit 0bb3f14
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/app/screen-snippet-handler.ts b/src/app/screen-snippet-handler.ts
@@ -186,8 +186,8 @@ class ScreenSnippet {
           currentWindowName,
           hideOnCapture,
         );
-        this.uploadSnippet(webContents, hideOnCapture);
-        this.closeSnippet(webContents);
+        this.uploadSnippet(currentWindowObj, webContents, hideOnCapture);
+        this.closeSnippet(currentWindowObj?.webContents);
         this.copyToClipboard();
         this.saveAs();
         return;
@@ -335,7 +335,11 @@ class ScreenSnippet {
    * Uploads a screen snippet
    * @param webContents A browser window's web contents object
    */
-  private uploadSnippet(webContents: WebContents, hideOnCapture?: boolean) {
+  private uploadSnippet(
+    focusedWindow: BrowserWindow | null,
+    webContents: WebContents,
+    hideOnCapture?: boolean,
+  ) {
     ipcMain.once(
       'upload-snippet',
       async (
@@ -362,15 +366,15 @@ class ScreenSnippet {
             `screen-snippet-handler: upload of screen capture failed with error: ${error}!`,
           );
         }
-        webContents.focus();
+        focusedWindow?.webContents.focus();
       },
     );
   }
 
   /**
    * Close the current snippet
    */
-  private closeSnippet(webContents: WebContents) {
+  private closeSnippet(webContents: WebContents | undefined) {
     ipcMain.once(ScreenShotAnnotation.CLOSE, async (_event) => {
       try {
         windowHandler.closeSnippingToolWindow();
@@ -381,7 +385,6 @@ class ScreenSnippet {
           `screen-snippet-handler: close window failed with error: ${error}!`,
         );
       }
-
       webContents?.focus();
     });
   }