smueller/youtube-music
1
0
Fork 0
mirror of https://github.com/th-ch/youtube-music.git synced 2026-01-11 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #217 from Araxeus/Refresh-menu-on-plugin-enable/disable

Browse Source 
Refresh menu on plugin enable/disable (show/hide submenu)
This commit is contained in:
th-ch
2021-04-02 21:43:12 +02:00
committed by GitHub
parent 8c9e37f8a1 5670a6d1b4
commit d67d697847
2 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
menu.js
View File

@ -7,7 +7,7 @@ const is = require("electron-is");
const { getAllPlugins } = require("./plugins/utils"); const { getAllPlugins } = require("./plugins/utils");
const config = require("./config"); const config = require("./config");
const pluginEnabledMenu = (plugin, label = "") => ({ const pluginEnabledMenu = (win, plugin, label = "", hasSubmenu=false) => ({
label: label || plugin, label: label || plugin,
type: "checkbox", type: "checkbox",
checked: config.plugins.isEnabled(plugin), checked: config.plugins.isEnabled(plugin),
@ -17,6 +17,9 @@ const pluginEnabledMenu = (plugin, label = "") => ({
} else { } else {
config.plugins.disable(plugin); config.plugins.disable(plugin);
} }
if(hasSubmenu) {
this.setApplicationMenu(win);
}
}, },
}); });
@ -27,16 +30,15 @@ const mainMenuTemplate = (win) => [
...getAllPlugins().map((plugin) => { ...getAllPlugins().map((plugin) => {
const pluginPath = path.join(__dirname, "plugins", plugin, "menu.js"); const pluginPath = path.join(__dirname, "plugins", plugin, "menu.js");
if (!config.plugins.isEnabled(plugin)) {
return pluginEnabledMenu(plugin);
}
if (existsSync(pluginPath)) { if (existsSync(pluginPath)) {
if (!config.plugins.isEnabled(plugin)) {
return pluginEnabledMenu(win, plugin, "", true);
}
const getPluginMenu = require(pluginPath); const getPluginMenu = require(pluginPath);
return { return {
label: plugin, label: plugin,
submenu: [ submenu: [
pluginEnabledMenu(plugin, "Enabled"), pluginEnabledMenu(win, plugin, "Enabled", true),
...getPluginMenu(win, config.plugins.getOptions(plugin), () => ...getPluginMenu(win, config.plugins.getOptions(plugin), () =>
module.exports.setApplicationMenu(win) module.exports.setApplicationMenu(win)
), ),
@ -44,7 +46,7 @@ const mainMenuTemplate = (win) => [
}; };
} }
return pluginEnabledMenu(plugin); return pluginEnabledMenu(win, plugin);
}), }),
{ type: "separator" }, { type: "separator" },
{ {

34
plugins/styled-bars/back.js
View File

@ -3,18 +3,18 @@ const { Menu } = require('electron');
const path = require('path'); const path = require('path');
const electronLocalshortcut = require("electron-localshortcut"); const electronLocalshortcut = require("electron-localshortcut");
const config = require('../../config'); const config = require('../../config');
var { mainMenuTemplate } = require("../../menu"); const { setApplicationMenu } = require("../../menu");
//override menu template for custom menu //override Menu.buildFromTemplate, making it also fix the template
const originTemplate = mainMenuTemplate; const originBuildMenu = Menu.buildFromTemplate;
mainMenuTemplate = function (winHook) { //this function natively gets called on all submenu so no more reason to use recursion
//get template Menu.buildFromTemplate = function (template) {
let template = originTemplate(winHook);
//fix checkbox and roles //fix checkbox and roles
fixMenu(template); fixMenu(template);
//return as normal //return as normal
return template; return originBuildMenu(template);
} }
//win hook for fixing menu //win hook for fixing menu
let win; let win;
@ -31,9 +31,9 @@ module.exports = winImport => {
return return
} }
done = true; done = true;
let template = mainMenuTemplate(win);
let menu = Menu.buildFromTemplate(template); //refresh menu to fix it
Menu.setApplicationMenu(menu); setApplicationMenu(win);
//register keyboard shortcut && hide menu if hideMenu is enabled //register keyboard shortcut && hide menu if hideMenu is enabled
if (config.get('options.hideMenu')) { if (config.get('options.hideMenu')) {
@ -53,21 +53,17 @@ function switchMenuVisibility() {
//go over each item in menu //go over each item in menu
function fixMenu(template) { function fixMenu(template) {
for (let index in template) { for (let item of template) {
let item = template[index]; //change onClick of checkbox+radio if not fixed
//apply function on submenu if ((item.type === 'checkbox' || item.type === 'radio') && !item.fixed) {
if (item.submenu != null) {
fixMenu(item.submenu);
}
//change onClick of checkbox+radio
else if (item.type === 'checkbox' || item.type === 'radio') {
let ogOnclick = item.click; let ogOnclick = item.click;
item.click = (itemClicked) => { item.click = (itemClicked) => {
ogOnclick(itemClicked); ogOnclick(itemClicked);
checkCheckbox(itemClicked); checkCheckbox(itemClicked);
}; };
item.fixed = true;
} }
//customize roles //customize roles (will be deleted soon)
else if (item.role != null) { else if (item.role != null) {
fixRoles(item) fixRoles(item)
} }