Regenerate id cache on deminimize (#1765)

Author: ianyh

Amethyst/Managers/WindowManager.swift

@@ -277,12 +277,6 @@ extension WindowManager {
 
     fileprivate func remove(window: Window) {
         markAllScreensForReflow(withChange: .remove(window: window))
-
-        let application = applicationWithPID(window.pid())
-        application?.unobserve(notification: kAXUIElementDestroyedNotification, window: window)
-        application?.unobserve(notification: kAXWindowMiniaturizedNotification, window: window)
-        application?.unobserve(notification: kAXWindowDeminiaturizedNotification, window: window)
-
         windows.regenerateActiveIDCache()
         windows.remove(window: window)
     }
@@ -381,11 +375,6 @@ extension WindowManager {
     }
 
     private func add(window: Window, retries: Int = 5) {
-        guard !windows.isWindowTracked(window) else {
-            log.warning("skipping window")
-            return
-        }
-
         guard window.shouldBeManaged() else {
             return
         }
@@ -395,6 +384,14 @@ extension WindowManager {
             return
         }
 
+        defer {
+            windows.regenerateActiveIDCache()
+        }
+
+        guard !windows.isWindowTracked(window) else {
+            return
+        }
+
         switch application.defaultFloatForWindow(window) {
         case .unreliable where retries > 0:
             return DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
@@ -406,21 +403,8 @@ extension WindowManager {
             windows.setFloating(false, forWindow: window)
         }
 
-        windows.regenerateActiveIDCache()
         windows.add(window: window, atFront: userConfiguration.sendNewWindowsToMainPane())
 
-        application.observe(notification: kAXUIElementDestroyedNotification, window: window) { _ in
-            self.remove(window: window)
-        }
-        application.observe(notification: kAXWindowMiniaturizedNotification, window: window) { _ in
-            self.remove(window: window)
-
-            guard let screen = window.screen() else {
-                return
-            }
-            self.markScreen(screen, forReflowWithChange: .remove(window: window))
-        }
-
         guard let screen = window.screen() else {
             return
         }

Amethyst/Model/ApplicationObservation.swift

@@ -106,6 +106,9 @@ struct ApplicationObservation<Delegate: ApplicationObservationDelegate> {
         /// A window is deminiaturized
         case windowDeminiaturized
 
+        /// A window is miniaturized
+        case windowMiniaturized
+
         /// The application has changed its focused window
         case focusedWindowChanged
 
@@ -128,6 +131,8 @@ struct ApplicationObservation<Delegate: ApplicationObservationDelegate> {
                 return kAXCreatedNotification
             case .windowDeminiaturized:
                 return kAXWindowDeminiaturizedNotification
+            case .windowMiniaturized:
+                return kAXWindowMiniaturizedNotification
             case .focusedWindowChanged:
                 return kAXFocusedWindowChangedNotification
             case .applicationActivated:
@@ -178,6 +183,7 @@ struct ApplicationObservation<Delegate: ApplicationObservationDelegate> {
         let notifications: [Notification] = [
             .created,
             .windowDeminiaturized,
+            .windowMiniaturized,
             .focusedWindowChanged,
             .applicationActivated,
             .windowMoved,
@@ -244,6 +250,8 @@ struct ApplicationObservation<Delegate: ApplicationObservationDelegate> {
             delegate?.application(application, didFindPotentiallyNewWindow: window)
         case .windowDeminiaturized:
             delegate?.application(application, didAddWindow: window)
+        case .windowMiniaturized:
+            delegate?.application(application, didRemoveWindow: window)
         case .focusedWindowChanged:
             guard let focusedWindow = Window.currentlyFocused() else {
                 return