From c4ced889b55d162c0efccbf6c48dabe55615652b Mon Sep 17 00:00:00 2001 From: Araxeus <78568641+Araxeus@users.noreply.github.com> Date: Tue, 28 Feb 2023 20:35:10 +0200 Subject: [PATCH] resolve merge error --- .../adaptors/in-app-menu.js | 43 ------------------- 1 file changed, 43 deletions(-) delete mode 100644 plugins/picture-in-picture/adaptors/in-app-menu.js diff --git a/plugins/picture-in-picture/adaptors/in-app-menu.js b/plugins/picture-in-picture/adaptors/in-app-menu.js deleted file mode 100644 index 0da110bc..00000000 --- a/plugins/picture-in-picture/adaptors/in-app-menu.js +++ /dev/null @@ -1,43 +0,0 @@ -const { Menu, app } = require("electron"); -const { setApplicationMenu } = require("../../../menu"); -const config = require("../../../config"); - -module.exports = (win, options, setOptions, togglePip, isInPip) => { - if (isInPip) { - Menu.setApplicationMenu(Menu.buildFromTemplate([ - { - label: "App", - submenu: [ - { - label: "Exit Picture in Picture", - click: togglePip, - }, - { - label: "Always on top", - type: "checkbox", - checked: options.alwaysOnTop, - click: (item) => { - setOptions({ alwaysOnTop: item.checked }); - win.setAlwaysOnTop(item.checked); - }, - }, - { - label: "Restart", - click: () => { - app.relaunch(); - app.quit(); - }, - }, - { role: "quit" }, - ], - }, - ])); - if (config.get("options.hideMenu")) { - setImmediate(() => { - win.webContents.send("toggleMenu"); - }); - } - } else { - setApplicationMenu(win); - } -};