From 5a25c16887b3f1deba642c78b3f85e28c4fdc91e Mon Sep 17 00:00:00 2001
From: end-4 <97237370+end-4@users.noreply.github.com>
Date: Wed, 3 Apr 2024 22:24:50 +0700
Subject: [PATCH] better relevant window check

---
 .config/ags/modules/click2close/main.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.config/ags/modules/click2close/main.js b/.config/ags/modules/click2close/main.js
index e2f806007..94426da21 100644
--- a/.config/ags/modules/click2close/main.js
+++ b/.config/ags/modules/click2close/main.js
@@ -21,9 +21,8 @@ export default (monitor = 0) => PopupWindow({
                 let relevant = false;
                 // use regex to check if name matches one of windows need click2close with a *
                 for (let i = 0; i < WINDOWS_NEED_CLICK2CLOSE.length; i++) {
-                    // const testRegex = RegExp(`^${WINDOWS_NEED_CLICK2CLOSE[i]}\\d+$`);
-                    const testRegex = /${WINDOWS_NEED_CLICK2CLOSE[i]}\\d+$/;
-                    if (testRegex.test(currentName) || WINDOWS_NEED_CLICK2CLOSE[i] == currentName) {
+                    const testRegex = RegExp(`^${WINDOWS_NEED_CLICK2CLOSE[i]}\\d*$`);
+                    if (testRegex.test(currentName)) {
                         relevant = true;
                         break;
                     }
@@ -35,8 +34,6 @@ export default (monitor = 0) => PopupWindow({
         onSecondaryClick: () => closeEverything(),
         onMiddleClick: () => closeEverything(),
         setup: (self) => self.hook(App, (self, currentName, visible) => {
-            if(currentName == 'click2close0') console.log(visible);
-
             if(!self.attribute.checkWindowRelevance(currentName)) return;
             range(Gdk.Display.get_default()?.get_n_monitors() || 1, 0).forEach(id => {
                 if(visible) App.openWindow(`click2close${id}`);