diff options
author | 2022-08-11 23:56:51 +0100 | |
---|---|---|
committer | 2022-08-11 23:56:51 +0100 | |
commit | 5d68307fd154dc95744e5f28a371b233764dbb67 (patch) | |
tree | 646e869390a6c05f9c9556480f728f295d36dadf | |
parent | 6.0.1-nightly.13 [skip ci] (diff) | |
download | ferdium-app-5d68307fd154dc95744e5f28a371b233764dbb67.tar.gz ferdium-app-5d68307fd154dc95744e5f28a371b233764dbb67.tar.zst ferdium-app-5d68307fd154dc95744e5f28a371b233764dbb67.zip |
fix: Toggle Full Screen not working on Menu bar (#552)
fix: role not working for toggle full screen
-rw-r--r-- | src/environment.ts | 2 | ||||
-rw-r--r-- | src/lib/Menu.js | 18 |
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) => | |||
41 | `${cmdOrCtrlShortcutKey(isAccelerator)}+${altKey(isAccelerator)}+S`; | 41 | `${cmdOrCtrlShortcutKey(isAccelerator)}+${altKey(isAccelerator)}+S`; |
42 | export const settingsShortcutKey = (isAccelerator = true) => | 42 | export const settingsShortcutKey = (isAccelerator = true) => |
43 | `${cmdOrCtrlShortcutKey(isAccelerator)}+${isMac ? ',' : 'P'}`; | 43 | `${cmdOrCtrlShortcutKey(isAccelerator)}+${isMac ? ',' : 'P'}`; |
44 | export const toggleFullScreenKey = () => | ||
45 | 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 { | |||
31 | chromeVersion, | 31 | chromeVersion, |
32 | nodeVersion, | 32 | nodeVersion, |
33 | osArch, | 33 | osArch, |
34 | toggleFullScreenKey, | ||
34 | } from '../environment'; | 35 | } from '../environment'; |
35 | import { CUSTOM_WEBSITE_RECIPE_ID, LIVE_API_FERDIUM_WEBSITE } from '../config'; | 36 | import { CUSTOM_WEBSITE_RECIPE_ID, LIVE_API_FERDIUM_WEBSITE } from '../config'; |
36 | import { ferdiumVersion } from '../environment-remote'; | 37 | import { ferdiumVersion } from '../environment-remote'; |
@@ -352,6 +353,18 @@ function getActiveService() { | |||
352 | return window['ferdium'].stores.services.active; | 353 | return window['ferdium'].stores.services.active; |
353 | } | 354 | } |
354 | 355 | ||
356 | function _toggleFullScreen() { | ||
357 | const mainWindow = getCurrentWindow(); | ||
358 | |||
359 | if (!mainWindow) return; | ||
360 | |||
361 | if (mainWindow.isFullScreen()) { | ||
362 | mainWindow.setFullScreen(false); | ||
363 | } else { | ||
364 | mainWindow.setFullScreen(true); | ||
365 | } | ||
366 | } | ||
367 | |||
355 | const _titleBarTemplateFactory = (intl, locked) => [ | 368 | const _titleBarTemplateFactory = (intl, locked) => [ |
356 | { | 369 | { |
357 | label: intl.formatMessage(menuItems.edit), | 370 | label: intl.formatMessage(menuItems.edit), |
@@ -487,7 +500,10 @@ const _titleBarTemplateFactory = (intl, locked) => [ | |||
487 | }, | 500 | }, |
488 | { | 501 | { |
489 | label: intl.formatMessage(menuItems.toggleFullScreen), | 502 | label: intl.formatMessage(menuItems.toggleFullScreen), |
490 | role: 'toggleFullScreen', | 503 | click: () => { |
504 | _toggleFullScreen(); | ||
505 | }, | ||
506 | accelerator: toggleFullScreenKey(), | ||
491 | }, | 507 | }, |
492 | { | 508 | { |
493 | label: intl.formatMessage(menuItems.toggleNavigationBar), | 509 | label: intl.formatMessage(menuItems.toggleNavigationBar), |