pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hide the 'Toggle Full Screen' menu on Linux as it hides the top menu completely making the app unable to use. #7494

pull/7686/head
Aditya Toshniwal 2024-07-23 15:17:29 +05:30
parent 3aedae1436
commit 18d507780d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/package.json
View File

@ -13,7 +13,7 @@
"packageManager": "yarn@3.8.2", "packageManager": "yarn@3.8.2",
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.6.0", "@eslint/js": "^9.6.0",
"electron": "^31.1.0", "electron": "^31.2.1",
"eslint": "^9.5.0" "eslint": "^9.5.0"
}, },
"dependencies": { "dependencies": {

4
runtime/src/js/menu.js
View File

@ -10,6 +10,7 @@
import { app, Menu, ipcMain, BrowserWindow } from 'electron'; import { app, Menu, ipcMain, BrowserWindow } from 'electron';
const isMac = process.platform == 'darwin'; const isMac = process.platform == 'darwin';
const isLinux = process.platform == 'linux';
let mainMenu; let mainMenu;
function buildMenu(pgadminMenus, pgAdminMainScreen, callbacks) { function buildMenu(pgadminMenus, pgAdminMainScreen, callbacks) {
@ -79,8 +80,7 @@ function buildMenu(pgadminMenus, pgAdminMainScreen, callbacks) {
{ role: 'zoomIn' }, { role: 'zoomIn' },
{ role: 'zoomOut' }, { role: 'zoomOut' },
{ type: 'separator' }, { type: 'separator' },
{ role: 'togglefullscreen' }, ].concat(isLinux ? [] : [{ role: 'togglefullscreen' }]),
],
}, },
{ role: 'windowMenu' }, { role: 'windowMenu' },
); );

10
runtime/yarn.lock
View File

@ -558,16 +558,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"electron@npm:^31.1.0": "electron@npm:^31.2.1":
version: 31.1.0 version: 31.2.1
resolution: "electron@npm:31.1.0" resolution: "electron@npm:31.2.1"
dependencies: dependencies:
"@electron/get": ^2.0.0 "@electron/get": ^2.0.0
"@types/node": ^20.9.0 "@types/node": ^20.9.0
extract-zip: ^2.0.1 extract-zip: ^2.0.1
bin: bin:
electron: cli.js electron: cli.js
checksum: 697fe7530680cda23619b81972cc3b613fdf23c191fbe3a6e4abbc932453601bdd21942e59379e0bd171307bfedd3a03ac759877ebc0ea2b7ccd3db8cf748e4b checksum: ef3296c31f88cbc3f8c4a92d40c301fc14bcfa7701bbf24316653276b61ec1345a09cc8278f3da88cd588609c883ffc9a38a0646b1051c0b8a59b63084a989a4
languageName: node languageName: node
linkType: hard linkType: hard
@ -1348,7 +1348,7 @@ __metadata:
"@eslint/js": ^9.6.0 "@eslint/js": ^9.6.0
axios: ^1.7.2 axios: ^1.7.2
bootstrap: ^4.5.3 bootstrap: ^4.5.3
electron: ^31.1.0 electron: ^31.2.1
electron-store: ^10.0.0 electron-store: ^10.0.0
eslint: ^9.5.0 eslint: ^9.5.0
languageName: unknown languageName: unknown