Merge pull request finos#2072 from NguyenTranHoangSym/SDA-4441

SDA-4441: Restore focus on main after closing sub Windows
swasunb · Jan 11, 2024 · d5647f0 · d5647f0
2 parents f888bf7 + a62eb6c
commit d5647f0
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts
@@ -643,6 +643,8 @@ export class WindowHandler {
 
     // workaround for https://perzoinc.atlassian.net/browse/SDA-4251
     this.mainWindow?.on('focus', () => {
+      const mainView = this.getMainView();
+      mainView?.webContents.focus();
       if (
         this.mainWindow &&
         windowExists(this.mainWindow) &&