fix: Toggle Full Screen not working on Menu bar (#552)

fix: role not working for toggle full screen

2 files changed, 19 insertions, 1 deletions

diff --git a/src/environment.ts b/src/environment.ts
index b1b4cb8b8..5838f1d53 100644
--- a/src/environment.ts
+++ b/src/environment.ts
@@ -41,3 +41,5 @@ export const splitModeToggleShortcutKey = (isAccelerator = true) =>
   `${cmdOrCtrlShortcutKey(isAccelerator)}+${altKey(isAccelerator)}+S`;
 export const settingsShortcutKey = (isAccelerator = true) =>
   `${cmdOrCtrlShortcutKey(isAccelerator)}+${isMac ? ',' : 'P'}`;
+export const toggleFullScreenKey = () =>
+  isMac ? `CTRL + ${cmdKey} + F` : `F11`;
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index b8826f12e..52b6be18a 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -31,6 +31,7 @@ import {
   chromeVersion,
   nodeVersion,
   osArch,
+  toggleFullScreenKey,
 } from '../environment';
 import { CUSTOM_WEBSITE_RECIPE_ID, LIVE_API_FERDIUM_WEBSITE } from '../config';
 import { ferdiumVersion } from '../environment-remote';
@@ -352,6 +353,18 @@ function getActiveService() {
   return window['ferdium'].stores.services.active;
 }
 
+function _toggleFullScreen() {
+  const mainWindow = getCurrentWindow();
+
+  if (!mainWindow) return;
+
+  if (mainWindow.isFullScreen()) {
+    mainWindow.setFullScreen(false);
+  } else {
+    mainWindow.setFullScreen(true);
+  }
+}
+
 const _titleBarTemplateFactory = (intl, locked) => [
   {
     label: intl.formatMessage(menuItems.edit),
@@ -487,7 +500,10 @@ const _titleBarTemplateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.toggleFullScreen),
-        role: 'toggleFullScreen',
+        click: () => {
+          _toggleFullScreen();
+        },
+        accelerator: toggleFullScreenKey(),
       },
       {
         label: intl.formatMessage(menuItems.toggleNavigationBar),