From 3485990f5df525101cde69961cc2bcddb1821d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Tue, 30 Nov 2021 10:23:52 +0100
Subject: [PATCH] [ivette] Dome: fixes menubar according to electron changes.
---
ivette/src/dome/main/menubar.ts | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ivette/src/dome/main/menubar.ts b/ivette/src/dome/main/menubar.ts
index d22df5c443e..98079524ddb 100644
--- a/ivette/src/dome/main/menubar.ts
+++ b/ivette/src/dome/main/menubar.ts
@@ -48,12 +48,12 @@ function reloadWindow() {
});
}
-function toggleFullScreen(_item: MenuItem, focusedWindow: BrowserWindow) {
+function toggleFullScreen(_item: MenuItem, focusedWindow?: BrowserWindow) {
if (focusedWindow)
focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
}
-function toggleDevTools(_item: MenuItem, focusedWindow: BrowserWindow) {
+function toggleDevTools(_item: MenuItem, focusedWindow?: BrowserWindow) {
if (focusedWindow)
focusedWindow.webContents.toggleDevTools();
}
@@ -190,9 +190,9 @@ const editMenuItems: MenuSpec = [
accelerator: 'CmdOrCtrl+F',
click: (
_item: Electron.MenuItem,
- window: Electron.BrowserWindow,
+ window: Electron.BrowserWindow | undefined,
_evt: Electron.KeyboardEvent,
- ) => window.webContents.send('dome.ipc.find'),
+ ) => window?.webContents.send('dome.ipc.find'),
},
];
@@ -362,9 +362,9 @@ export function addMenuItem(custom: CustomMenuItemSpec) {
if (!spec.click && !spec.role)
spec.click = (
_item: Electron.MenuItem,
- window: Electron.BrowserWindow,
+ window: Electron.BrowserWindow | undefined,
_evt: Electron.KeyboardEvent,
- ) => window.webContents.send('dome.ipc.menu.clicked', id);
+ ) => window?.webContents.send('dome.ipc.menu.clicked', id);
customItems.set(id, { spec });
menuSpec.push(spec);
}
--
GitLab