From 7d8b3469856cf6394f31508130af9dc3a949a7c3 Mon Sep 17 00:00:00 2001 From: Xinto Date: Sat, 23 Sep 2023 00:51:40 +0400 Subject: [PATCH] group darwin-specific menus --- src/main/mainWindow.ts | 56 ++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts index c1333ea..339a4d4 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.ts @@ -147,6 +147,8 @@ async function clearData(win: BrowserWindow) { app.quit(); } +type MenuItemList = Array; + function initMenuBar(win: BrowserWindow) { const isWindows = process.platform === "win32"; const isDarwin = process.platform === "darwin"; @@ -181,32 +183,34 @@ function initMenuBar(win: BrowserWindow) { app.quit(); } }, - isDarwin && { - type: "separator" - }, - isDarwin && { - label: "Settings", - accelerator: "CmdOrCtrl+,", - async click() { - mainWin.webContents.executeJavaScript("Vencord.Webpack.Common.SettingsRouter.open()") + ...(!isDarwin ? [] : [ + { + type: "separator" + }, + { + label: "Settings", + accelerator: "CmdOrCtrl+,", + async click() { + mainWin.webContents.executeJavaScript("Vencord.Webpack.Common.SettingsRouter.open()") + } + }, + { + type: "separator" + }, + { + label: "Hide Vesktop", //Should probably remove the label, but it says "Hide VencordDesktop" instead of "Hide Vesktop" + role: "hide" + }, + { + role: "hideOthers" + }, + { + role: "unhide", + }, + { + type: "separator" } - }, - isDarwin && { - type: "separator" - }, - isDarwin && { - label: "Hide Vesktop", //Should probably remove the label, but it says "Hide VencordDesktop" instead of "Hide Vesktop" - role: "hide" - }, - isDarwin && { - role: "hideOthers" - }, - isDarwin && { - role: "unhide", - }, - isDarwin && { - type: "separator" - }, + ] satisfies MenuItemList), { label: "Quit", accelerator: wantCtrlQ ? "CmdOrCtrl+Q" : void 0, @@ -231,7 +235,7 @@ function initMenuBar(win: BrowserWindow) { role: "zoomIn", visible: false } - ] satisfies Array; + ] satisfies MenuItemList; const menu = Menu.buildFromTemplate([ {