Fixed menus on macOS

Fixed menus of child windows on macOS
amanharwara · Feb 26, 2019 · cbe7068 · cbe7068
1 parent 94339d7
commit cbe7068
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 32 deletions.
diff --git a/src/windows/about/js/about.js b/src/windows/about/js/about.js
@@ -9,38 +9,11 @@ const {
     ipcRenderer
 } = require('electron');
 
-const linksMenu = new Menu();
-
-linksMenu.append(new MenuItem({
-    label: 'Links',
-    submenu: [{
-        label: 'Website',
-        click: () => {
-            ipcRenderer.send('link-open', 'https://shadythgod.github.io');
-        }
-    }, {
-        label: 'GitHub',
-        click: () => {
-            ipcRenderer.send('link-open', 'https://www.github.com/shadythgod');
-        }
-    }, {
-        label: 'Repository',
-        click: () => {
-            ipcRenderer.send('link-open', 'https://www.github.com/shadythgod/altus');
-        }
-    }, {
-        label: 'My Instagram',
-        click: () => {
-            ipcRenderer.send('link-open', 'https://www.instagram.com/aman_harwara');
-        }
-    }]
-}));
-
 // Create main window titlebar
 const mainTitlebar = new customTitlebar.Titlebar({
     backgroundColor: customTitlebar.Color.fromHex('#21252B'),
     icon: '../assets/icons/icon.ico',
-    menu: linksMenu,
+    menu: process.platform === 'darwin' ? Menu.getApplicationMenu() : new Menu(),
     minimizable: false,
     maximizable: false,
     closeable: true

diff --git a/src/windows/customCSS/js/customCSS.js b/src/windows/customCSS/js/customCSS.js
@@ -11,7 +11,7 @@ const {
 const mainTitlebar = new customTitlebar.Titlebar({
     backgroundColor: customTitlebar.Color.fromHex('#21252B'),
     icon: '../assets/icons/icon.ico',
-    menu: new Menu(),
+    menu: process.platform === 'darwin' ? Menu.getApplicationMenu() : new Menu(),
     minimizable: false,
     maximizable: false,
     closeable: true

diff --git a/src/windows/settings/js/settings.js b/src/windows/settings/js/settings.js
@@ -18,7 +18,7 @@ const settings = new Store({
 const mainTitlebar = new customTitlebar.Titlebar({
     backgroundColor: customTitlebar.Color.fromHex('#21252B'),
     icon: '../assets/icons/icon.ico',
-    menu: new Menu(),
+    menu: process.platform === 'darwin' ? Menu.getApplicationMenu() : new Menu(),
     minimizable: false,
     maximizable: false,
     closeable: true

diff --git a/src/windows/themeCustomizer/js/themeCustomizer.js b/src/windows/themeCustomizer/js/themeCustomizer.js
@@ -9,7 +9,7 @@ let cssClipboard = new ClipboardJS('#copy-css-button');
 const mainTitlebar = new customTitlebar.Titlebar({
     backgroundColor: customTitlebar.Color.fromHex('#21252B'),
     icon: '../assets/icons/icon.ico',
-    menu: new Menu(),
+    menu: process.platform === 'darwin' ? Menu.getApplicationMenu() : new Menu(),
     minimizable: false,
     maximizable: false,
     closeable: true

diff --git a/src/windows/themeManager/js/themeManager.js b/src/windows/themeManager/js/themeManager.js
@@ -10,7 +10,7 @@ const Store = require('electron-store');
 const mainTitlebar = new customTitlebar.Titlebar({
     backgroundColor: customTitlebar.Color.fromHex('#21252B'),
     icon: '../assets/icons/icon.ico',
-    menu: new Menu(),
+    menu: process.platform === 'darwin' ? Menu.getApplicationMenu() : new Menu(),
     minimizable: false,
     maximizable: false,
     closeable: true