diff --git a/src/main/menus/app.ts b/src/main/menus/app.ts index 68b718af3c..7e15ec666e 100644 --- a/src/main/menus/app.ts +++ b/src/main/menus/app.ts @@ -231,7 +231,7 @@ export function createTemplate(config: Config, updateManager: UpdateManager) { ]); } - const viewSubMenu = [{ + const viewSubMenu: Electron.MenuItemConstructorOptions[] = [{ label: localizeMessage('main.menus.app.view.find', 'Find..'), accelerator: 'CmdOrCtrl+F', click() { @@ -250,11 +250,17 @@ export function createTemplate(config: Config, updateManager: UpdateManager) { session.defaultSession.clearCache(); ViewManager.reload(); }, - }, { - role: 'togglefullscreen', - label: localizeMessage('main.menus.app.view.fullscreen', 'Toggle Full Screen'), - accelerator: isMac ? 'Ctrl+Cmd+F' : 'F11', - }, separatorItem, { + }]; + + if (process.platform !== 'linux') { + viewSubMenu.push({ + role: 'togglefullscreen', + label: localizeMessage('main.menus.app.view.fullscreen', 'Toggle Full Screen'), + accelerator: isMac ? 'Ctrl+Cmd+F' : 'F11', + }); + } + + viewSubMenu.push(separatorItem, { label: localizeMessage('main.menus.app.view.actualSize', 'Actual Size'), role: 'resetZoom', accelerator: 'CmdOrCtrl+0', @@ -284,7 +290,7 @@ export function createTemplate(config: Config, updateManager: UpdateManager) { }, separatorItem, { label: localizeMessage('main.menus.app.view.devToolsSubMenu', 'Developer Tools'), submenu: devToolsSubMenu, - }]; + }); if (process.platform !== 'darwin' && process.platform !== 'win32') { viewSubMenu.push(separatorItem); diff --git a/src/main/windows/mainWindow.ts b/src/main/windows/mainWindow.ts index 074036ef69..c32e22c745 100644 --- a/src/main/windows/mainWindow.ts +++ b/src/main/windows/mainWindow.ts @@ -74,7 +74,7 @@ export class MainWindow extends EventEmitter { const windowOptions: BrowserWindowConstructorOptions = Object.assign({}, this.savedWindowState, { title: app.name, - fullscreenable: true, + fullscreenable: process.platform !== 'linux', show: false, // don't start the window until it is ready and only if it isn't hidden paintWhenInitiallyHidden: true, // we want it to start painting to get info from the webapp minWidth: MINIMUM_WINDOW_WIDTH, @@ -231,6 +231,10 @@ export class MainWindow extends EventEmitter { }; private shouldStartFullScreen = () => { + if (process.platform === 'linux') { + return false; + } + if (global?.args?.fullscreen !== undefined) { return global.args.fullscreen; } diff --git a/src/renderer/components/SettingsPage.tsx b/src/renderer/components/SettingsPage.tsx index 5419d946c3..2406fe2bb4 100644 --- a/src/renderer/components/SettingsPage.tsx +++ b/src/renderer/components/SettingsPage.tsx @@ -982,32 +982,34 @@ class SettingsPage extends React.PureComponent { , ); - options.push( - - - - + if (process.platform !== 'linux') { + options.push( + + - - , - ); + + + + , + ); + } options.push(