Skip to content

Commit

Permalink
Hide the 'Toggle Full Screen' menu on Linux as it hides the top menu …
Browse files Browse the repository at this point in the history
…completely making the app unable to use. #7494
  • Loading branch information
adityatoshniwal committed Jul 23, 2024
1 parent 3aedae1 commit 18d5077
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"packageManager": "yarn@3.8.2",
"devDependencies": {
"@eslint/js": "^9.6.0",
"electron": "^31.1.0",
"electron": "^31.2.1",
"eslint": "^9.5.0"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/js/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import { app, Menu, ipcMain, BrowserWindow } from 'electron';

const isMac = process.platform == 'darwin';
const isLinux = process.platform == 'linux';
let mainMenu;

function buildMenu(pgadminMenus, pgAdminMainScreen, callbacks) {
Expand Down Expand Up @@ -79,8 +80,7 @@ function buildMenu(pgadminMenus, pgAdminMainScreen, callbacks) {
{ role: 'zoomIn' },
{ role: 'zoomOut' },
{ type: 'separator' },
{ role: 'togglefullscreen' },
],
].concat(isLinux ? [] : [{ role: 'togglefullscreen' }]),
},
{ role: 'windowMenu' },
);
Expand Down
10 changes: 5 additions & 5 deletions runtime/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -558,16 +558,16 @@ __metadata:
languageName: node
linkType: hard

"electron@npm:^31.1.0":
version: 31.1.0
resolution: "electron@npm:31.1.0"
"electron@npm:^31.2.1":
version: 31.2.1
resolution: "electron@npm:31.2.1"
dependencies:
"@electron/get": ^2.0.0
"@types/node": ^20.9.0
extract-zip: ^2.0.1
bin:
electron: cli.js
checksum: 697fe7530680cda23619b81972cc3b613fdf23c191fbe3a6e4abbc932453601bdd21942e59379e0bd171307bfedd3a03ac759877ebc0ea2b7ccd3db8cf748e4b
checksum: ef3296c31f88cbc3f8c4a92d40c301fc14bcfa7701bbf24316653276b61ec1345a09cc8278f3da88cd588609c883ffc9a38a0646b1051c0b8a59b63084a989a4
languageName: node
linkType: hard

Expand Down Expand Up @@ -1348,7 +1348,7 @@ __metadata:
"@eslint/js": ^9.6.0
axios: ^1.7.2
bootstrap: ^4.5.3
electron: ^31.1.0
electron: ^31.2.1
electron-store: ^10.0.0
eslint: ^9.5.0
languageName: unknown
Expand Down

0 comments on commit 18d5077

Please sign in to comment.