Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2025-11-02 11:25:49 +01:00
Code Issues Packages Projects Releases Activity

Fix close and titlebar issues

Browse Source
This commit is contained in:
Ximi1970
2022-07-08 14:25:55 +02:00
parent 1d13810f64
commit ab60c90879
4 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
webext/js/windowEvent.js
View File

@@ -105,6 +105,10 @@ var windowListener = new (class extends ExtensionCommon.EventEmitter {
true
);
windowListener.hijackTitlebarCloseButton(window);
windowListener.oldClose = window.close;
window.close = () => windowListener.onCloseButton3(null);
console.log("Close listener added");
}
},
@@ -129,6 +133,8 @@ var windowListener = new (class extends ExtensionCommon.EventEmitter {
windowListener.onCloseButton,
true
);
window.close = windowListener.oldClose;
console.log("Close listener removed");
}
}
@@ -137,15 +143,33 @@ var windowListener = new (class extends ExtensionCommon.EventEmitter {
}
onCloseButton(event) {
windowListener.emit("close-clicked");
console.log("Close clicked, event");
if (event) event.preventDefault();
windowListener.emit("close-clicked");
return true;
}
onCloseButton2(event) {
console.log("Close clicked, hijack");
if (event) event.preventDefault();
windowListener.emit("close-clicked");
return true;
}
onCloseButton3(event) {
console.log("Close clicked, close func");
if (event) event.preventDefault();
windowListener.emit("close-clicked");
return true;
}
hijackTitlebarCloseButton(window) {
if (
windowListener.replaceCommand(window, "titlebar-close", function () {
return windowListener.onCloseButton(null);
return windowListener.onCloseButton2(null);
})
) {
console.log("replaced command= " + "titlebar-close");