diff --git a/menu.js b/menu.js index bb0424b5..68c96e77 100644 --- a/menu.js +++ b/menu.js @@ -7,7 +7,7 @@ const is = require("electron-is"); const { getAllPlugins } = require("./plugins/utils"); const config = require("./config"); -const pluginEnabledMenu = (win, plugin, label = "") => ({ +const pluginEnabledMenu = (win, plugin, label = "", hasSubmenu=false) => ({ label: label || plugin, type: "checkbox", checked: config.plugins.isEnabled(plugin), @@ -17,7 +17,9 @@ const pluginEnabledMenu = (win, plugin, label = "") => ({ } else { config.plugins.disable(plugin); } - this.setApplicationMenu(win); + if(hasSubmenu) { + this.setApplicationMenu(win); + } }, }); @@ -28,16 +30,15 @@ const mainMenuTemplate = (win) => [ ...getAllPlugins().map((plugin) => { const pluginPath = path.join(__dirname, "plugins", plugin, "menu.js"); - if (!config.plugins.isEnabled(plugin)) { - return pluginEnabledMenu(win, plugin); - } - if (existsSync(pluginPath)) { + if (!config.plugins.isEnabled(plugin)) { + return pluginEnabledMenu(win, plugin, "", true); + } const getPluginMenu = require(pluginPath); return { label: plugin, submenu: [ - pluginEnabledMenu(win, plugin, "Enabled"), + pluginEnabledMenu(win, plugin, "Enabled", true), ...getPluginMenu(win, config.plugins.getOptions(plugin), () => module.exports.setApplicationMenu(win) ), diff --git a/plugins/styled-bars/back.js b/plugins/styled-bars/back.js index 433a56d8..8c9a9185 100644 --- a/plugins/styled-bars/back.js +++ b/plugins/styled-bars/back.js @@ -22,7 +22,6 @@ let win; let done = false; module.exports = winImport => { - //override menu template for custom menu win = winImport; // css for custom scrollbar + disable drag area(was causing bugs) injectCSS(win.webContents, path.join(__dirname, 'style.css'));