core: respect visible menu for fullscreen

The commit updates the handling of `toggle full screen` to respect
`menuBarVisibility` properly. If the `menuBarVisibility` is set to
`visible` the menu should be visible when the app is in fullscreen.

Signed-off-by: vince-fugnitto <[email protected]>

Author: vince-fugnitto

packages/core/src/electron-browser/menu/electron-menu-contribution.ts

@@ -120,6 +120,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
         this.shell.bottomPanel.onDidToggleMaximized(() => {
             this.handleToggleMaximized();
         });
+        this.attachMenuBarVisibilityListener();
     }
 
     protected attachWindowFocusListener(app: FrontendApplication): void {
@@ -132,6 +133,15 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
         window.addEventListener('unload', () => targetWindow.off('focus', callback));
     }
 
+    protected attachMenuBarVisibilityListener(): void {
+        this.preferenceService.onPreferenceChanged(e => {
+            if (e.preferenceName === 'window.menuBarVisibility') {
+                const targetWindow = electronRemote.getCurrentWindow();
+                this.handleFullScreen(targetWindow, e.newValue);
+            }
+        });
+    }
+
     handleTitleBarStyling(app: FrontendApplication): void {
         this.hideTopPanel(app);
         electron.ipcRenderer.on(TitleBarStyleAtStartup, (_event, style: string) => {
@@ -309,7 +319,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
         registry.registerCommand(ElectronCommands.TOGGLE_FULL_SCREEN, {
             isEnabled: () => currentWindow.isFullScreenable(),
             isVisible: () => currentWindow.isFullScreenable(),
-            execute: () => currentWindow.setFullScreen(!currentWindow.isFullScreen())
+            execute: () => this.toggleFullScreen(currentWindow)
         });
     }
 
@@ -377,4 +387,27 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
             order: '0'
         });
     }
+
+    protected toggleFullScreen(currentWindow: electron.BrowserWindow): void {
+        currentWindow.setFullScreen(!currentWindow.isFullScreen());
+        const menuBarVisibility = this.preferenceService.get('window.menuBarVisibility', 'classic');
+        this.handleFullScreen(currentWindow, menuBarVisibility);
+    }
+
+    protected handleFullScreen(currentWindow: electron.BrowserWindow, menuBarVisibility: string): void {
+        if (currentWindow.isFullScreen()) {
+            if (this.titleBarStyle === 'custom') {
+                return menuBarVisibility === 'visible' ? this.shell.topPanel.show() : this.shell.topPanel.hide();
+            } else {
+                currentWindow.menuBarVisible = menuBarVisibility === 'visible';
+            }
+        } else {
+            if (this.titleBarStyle === 'custom') {
+                this.shell.topPanel.show();
+            } else {
+                currentWindow.menuBarVisible = true;
+            }
+        }
+    }
+
 }