window: use unmanaged event to delete windows

hardpixel · Apr 16, 2022 · eb1a360 · eb1a360
1 parent 07f1287
commit eb1a360
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/[email protected]/window.js b/[email protected]/window.js
@@ -366,10 +366,6 @@ var WindowManager = GObject.registerClass(
         global.window_manager, 'map', this._onMapWindow.bind(this)
       )
 
-      this.signals.connect(
-        global.window_manager, 'destroy', this._onDestroyWindow.bind(this)
-      )
-
       this.signals.connect(
         global.display, 'window-entered-monitor', this._onWindowEntered.bind(this)
       )
@@ -413,6 +409,10 @@ var WindowManager = GObject.registerClass(
       if (!this.hasWindow(win)) {
         const meta = new MetaWindow(win)
         this.windows.set(getId(win), meta)
+
+        win.connect('unmanaged', () => {
+          this.deleteWindow(win, false)
+        })
       }
     }
 
@@ -437,12 +437,6 @@ var WindowManager = GObject.registerClass(
       }
     }
 
-    _onDestroyWindow(shellwm, { meta_window }) {
-      if (isValid(meta_window)) {
-        this.deleteWindow(meta_window, false)
-      }
-    }
-
     _onWindowEntered(display, index, meta_window) {
       if (isValid(meta_window)) {
         this.setWindow(meta_window)