SDA-4256 - Exit fullscreen before hiding the main window (#2020)

finos · Nov 28, 2023 · 723f802 · 723f802
1 parent c9f358f
commit 723f802
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/src/app/stores/window-store.ts b/src/app/stores/window-store.ts
@@ -5,7 +5,11 @@ import { isMac } from '../../common/env';
 import { logger } from '../../common/logger';
 import { presenceStatus } from '../presence-status-handler';
 import { ICustomBrowserWindow, windowHandler } from '../window-handler';
-import { getWindowByName, showBadgeCount } from '../window-utils';
+import {
+  getWindowByName,
+  hideFullscreenWindow,
+  showBadgeCount,
+} from '../window-utils';
 
 export interface IWindowObject {
   windows: IWindowState[];
@@ -56,7 +60,7 @@ export class WindowStore {
         ) {
           if (isMac) {
             if (isFullScreen) {
-              this.hideFullscreenWindow(currentWindow);
+              hideFullscreenWindow(currentWindow);
               // No need to hide minimized windows
             } else if (!isMinimized) {
               currentWindow?.hide();
@@ -150,19 +154,6 @@ export class WindowStore {
       });
   };
 
-  private hideFullscreenWindow = (window: BrowserWindow) => {
-    window.once('leave-full-screen', () => {
-      if (isMac) {
-        window.hide();
-      } else {
-        setTimeout(() => {
-          window.hide();
-        }, 0);
-      }
-    });
-    window.setFullScreen(false);
-  };
-
   /**
    * Restores windows that are in fullscreen and focus on the right window
    * On macOS, windows in fullscreen need to be restore one by one

diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts
@@ -73,6 +73,7 @@ import {
   getWindowByName,
   handleCertificateProxyVerification,
   handleDownloadManager,
+  hideFullscreenWindow,
   initSysTray,
   injectStyles,
   isSymphonyReachable,
@@ -775,7 +776,13 @@ export class WindowHandler {
 
       if (isMac && !this.isAutoUpdating) {
         event.preventDefault();
-        this.mainWindow.hide();
+        // this is a workaround for an issue with macOS
+        // https://github.com/electron/electron/issues/39572
+        if (this.mainWindow.isFullScreen()) {
+          hideFullscreenWindow(this.mainWindow);
+        } else {
+          this.mainWindow.hide();
+        }
         return;
       }
 

diff --git a/src/app/window-utils.ts b/src/app/window-utils.ts
@@ -1440,3 +1440,20 @@ export const loadBrowserViews = async (
 
   return mainView.webContents;
 };
+
+export const hideFullscreenWindow = (window: BrowserWindow) => {
+  window.once('leave-full-screen', () => {
+    if (!window && !windowExists(window)) {
+      logger.info('window-utils: window does not exists');
+      return;
+    }
+    if (isMac) {
+      window.hide();
+    } else {
+      setTimeout(() => {
+        window.hide();
+      }, 0);
+    }
+    window.setFullScreen(false);
+  });
+};