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

fix hide-menu timing + minify log function

Browse Source
This commit is contained in:
Araxeus
2021-04-05 04:04:29 +03:00
parent 11bd1adbd4
commit 6472002f8a
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/in-app-menu/back.js
View File

@ -8,7 +8,9 @@ const { setApplicationMenu } = require("../../menu");
const { injectCSS } = require("../utils"); const { injectCSS } = require("../utils");
//check that menu doesn't get created twice //check that menu doesn't get created twice
let done = false; let calledReadyToShow = false;
//check menu state isn't changed twice
let calledFinishedLoad = false
//tracks menu visibility //tracks menu visibility
let visible = true; let visible = true;
// win hook for fixing menu // win hook for fixing menu
@ -32,30 +34,37 @@ module.exports = (winImport) => {
win.on("ready-to-show", () => { win.on("ready-to-show", () => {
// (apparently ready-to-show is called twice) // (apparently ready-to-show is called twice)
if (done) { if (calledReadyToShow) {
return; return;
} }
done = true; calledReadyToShow = true;
setApplicationMenu(win); 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")) {
switchMenuVisibility();
electronLocalshortcut.register(win, "Esc", () => { electronLocalshortcut.register(win, "Esc", () => {
switchMenuVisibility(); switchMenuVisibility();
}); });
} }
// fix bug with menu not applying on start when no internet connection available
setMenuVisibility(visible);
}); });
//set menu visibility on load
win.webContents.on("did-finish-load", () => {
if (calledFinishedLoad) {
return;
}
calledFinishedLoad = true;
// fix bug with menu not applying on start when no internet connection available
setMenuVisibility(!config.get("options.hideMenu"));
})
}; };
function switchMenuVisibility() { function switchMenuVisibility() {
setMenuVisibility(!visible); setMenuVisibility(!visible);
} }
function setMenuVisibility(value){ function setMenuVisibility(value) {
visible = value; visible = value;
win.webContents.send("updateMenu", visible); win.webContents.send("updateMenu", visible);
} }
@ -79,7 +88,7 @@ function updateTemplate(template) {
let originalOnclick = item.click; let originalOnclick = item.click;
item.click = (itemClicked) => { item.click = (itemClicked) => {
originalOnclick(itemClicked); originalOnclick(itemClicked);
updateCheckboxesAndRadioButtons(itemClicked, item.type==='radio', item.hasSubmenu); updateCheckboxesAndRadioButtons(itemClicked, item.type === 'radio', item.hasSubmenu);
}; };
item.fixed = true; item.fixed = true;
} }

11
providers/logger.js
View File

@ -3,12 +3,9 @@ const { ipcRenderer } = require("electron");
module.exports = () => { module.exports = () => {
ipcRenderer.on("log", (event, log) => { ipcRenderer.on("log", (event, log) => {
let string = log.toString() || log; let string = log.toString() || log;
if (string) { if (!string || string === "[object Object]") {
string = JSON.stringify(log);
}
console.log(string); console.log(string);
} else {
for (let propery of log) {
console.log(propery.toString() || propery);
}
}
}) })
} };