From 7f27cb950b5be886a63069fd172057abd6a5cddf Mon Sep 17 00:00:00 2001 From: Louis Pontoise Date: Mon, 6 Apr 2020 15:30:40 +0900 Subject: [PATCH] fix: focus correct window after app quits (see #213) --- src/logic/Applications.swift | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/logic/Applications.swift b/src/logic/Applications.swift index 9d8ebf82..4b8b3901 100644 --- a/src/logic/Applications.swift +++ b/src/logic/Applications.swift @@ -49,19 +49,20 @@ class Applications { } static func removeRunningApplications(_ runningApps: [NSRunningApplication]) { + var windowsOnTheLeftOfFocusedWindow = 0 for runningApp in runningApps { Applications.list.removeAll(where: { $0.runningApplication.isEqual(runningApp) }) - var indexesToRemove = [Int]() Windows.list.enumerated().forEach { (index, window) in - if window.application.runningApplication.isEqual(runningApp) { - indexesToRemove.append(index) + if window.application.runningApplication.isEqual(runningApp) && index <= Windows.focusedWindowIndex { + windowsOnTheLeftOfFocusedWindow += 1 } } Windows.list.removeAll(where: { $0.application.runningApplication.isEqual(runningApp) }) } guard Windows.list.count > 0 else { App.app.hideUi(); return } - // TODO: implement of more sophisticated way to decide which thumbnail gets focused on app quit - Windows.updateFocusedWindowIndex(1) + if windowsOnTheLeftOfFocusedWindow > 0 { + Windows.cycleFocusedWindowIndex(-windowsOnTheLeftOfFocusedWindow) + } App.app.refreshOpenUi() }