better relevant window check

This commit is contained in:
end-4
2024-04-03 22:24:50 +07:00
parent 9fdc7e0ac4
commit 985f2afb36
+2 -5
View File
@@ -21,9 +21,8 @@ export default (monitor = 0) => PopupWindow({
let relevant = false; let relevant = false;
// use regex to check if name matches one of windows need click2close with a * // use regex to check if name matches one of windows need click2close with a *
for (let i = 0; i < WINDOWS_NEED_CLICK2CLOSE.length; i++) { for (let i = 0; i < WINDOWS_NEED_CLICK2CLOSE.length; i++) {
// const testRegex = RegExp(`^${WINDOWS_NEED_CLICK2CLOSE[i]}\\d+$`); const testRegex = RegExp(`^${WINDOWS_NEED_CLICK2CLOSE[i]}\\d*$`);
const testRegex = /${WINDOWS_NEED_CLICK2CLOSE[i]}\\d+$/; if (testRegex.test(currentName)) {
if (testRegex.test(currentName) || WINDOWS_NEED_CLICK2CLOSE[i] == currentName) {
relevant = true; relevant = true;
break; break;
} }
@@ -35,8 +34,6 @@ export default (monitor = 0) => PopupWindow({
onSecondaryClick: () => closeEverything(), onSecondaryClick: () => closeEverything(),
onMiddleClick: () => closeEverything(), onMiddleClick: () => closeEverything(),
setup: (self) => self.hook(App, (self, currentName, visible) => { setup: (self) => self.hook(App, (self, currentName, visible) => {
if(currentName == 'click2close0') console.log(visible);
if(!self.attribute.checkWindowRelevance(currentName)) return; if(!self.attribute.checkWindowRelevance(currentName)) return;
range(Gdk.Display.get_default()?.get_n_monitors() || 1, 0).forEach(id => { range(Gdk.Display.get_default()?.get_n_monitors() || 1, 0).forEach(id => {
if(visible) App.openWindow(`click2close${id}`); if(visible) App.openWindow(`click2close${id}`);