Skip to content

Commit df01f6b

Browse files
committed
feat: fix menus
1 parent e2fc74e commit df01f6b

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

electron-app/src/menu/menu.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ function createMenu(mainWindow) {
3030
{
3131
label: "Reload",
3232
accelerator: "CmdOrCtrl+R",
33-
click: () => mainWindow.reload(),
33+
click: (_, browserWindow) => {
34+
if (browserWindow) {
35+
browserWindow.reload();
36+
}
37+
},
3438
},
3539
{ type: "separator" },
3640
{
@@ -61,7 +65,11 @@ function createMenu(mainWindow) {
6165
{
6266
label: "Toggle DevTools",
6367
accelerator: "F12",
64-
click: () => mainWindow.webContents.toggleDevTools(),
68+
click: (_, browserWindow) => {
69+
if (browserWindow) {
70+
browserWindow.webContents.toggleDevTools();
71+
}
72+
},
6573
},
6674
],
6775
},
@@ -118,7 +126,7 @@ function createMenu(mainWindow) {
118126
];
119127

120128
const menu = Menu.buildFromTemplate(template);
121-
Menu.setApplicationMenu(menu);
129+
return menu;
122130
}
123131

124132
export { createMenu };

electron-app/src/windows/mainWindow.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ function createWindow(screenWidth, screenHeight) {
5151
loadView(currentView);
5252

5353
// Create application menu
54-
createMenu(mainWindow);
54+
const menu = createMenu(mainWindow);
55+
mainWindow.setApplicationMenu(menu);
5556

5657
// Open DevTools in development mode
5758
if (!app.isPackaged) {

0 commit comments

Comments
 (0)