Merge branch 'local-upstream/master' into use-ToastXML

This commit is contained in:
Araxeus
2023-01-16 21:36:47 +02:00
11 changed files with 89 additions and 6966 deletions

View File

@ -183,7 +183,7 @@ function createMainWindow() {
win.webContents.loadURL(urlToLoad);
win.on("closed", onClosed);
const setPiPOptions = config.plugins.isEnabled("picture-in-picture")
const setPiPOptions = config.plugins.isEnabled("picture-in-picture")
? (key, value) => require("./plugins/picture-in-picture/back").setOptions({ [key]: value })
: () => {};
@ -311,17 +311,6 @@ app.once("browser-window-created", (event, win) => {
win.webContents.on("will-prevent-unload", (event) => {
event.preventDefault();
});
win.webContents.on(
"new-window",
(e, url, frameName, disposition, options) => {
// hook on new opened window
// at now new window in mainWindow renderer process.
// Also, this will automatically get an option `nodeIntegration=false`(not override to true, like in iframe's) - like in regular browsers
options.webPreferences.affinity = "main-window";
}
);
});
app.on("window-all-closed", () => {