From 0ce5a491726cdc888b4aa0687bd42b7aeaf4bb40 Mon Sep 17 00:00:00 2001 From: ad Date: Mon, 16 Apr 2018 22:43:06 +0300 Subject: [PATCH] * removed buggy "recent apps" --- MTMR/AppScrubberTouchBarItem.swift | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/MTMR/AppScrubberTouchBarItem.swift b/MTMR/AppScrubberTouchBarItem.swift index 3e34467..8584627 100644 --- a/MTMR/AppScrubberTouchBarItem.swift +++ b/MTMR/AppScrubberTouchBarItem.swift @@ -62,8 +62,7 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub } func updateRunningApplication() { - let isDockOrder = false - let newApplications = (isDockOrder ? dockPersistentApplications() : launchedApplications()).filter { + let newApplications = launchedApplications().filter { !$0.isTerminated && $0.bundleIdentifier != nil } let frontmost = NSWorkspace.shared.frontmostApplication @@ -117,29 +116,6 @@ private func launchedApplications() -> [NSRunningApplication] { } } -private func dockPersistentApplications() -> [NSRunningApplication] { - let apps = NSWorkspace.shared.runningApplications.filter { - $0.activationPolicy == .regular - } - - guard let dockDefaults = UserDefaults(suiteName: "com.apple.dock"), - let persistentApps = dockDefaults.array(forKey: "persistent-apps") as [AnyObject]?, - let bundleIDs = persistentApps.compactMap({ $0.value(forKeyPath: "tile-data.bundle-identifier") }) as? [String] else { - return apps - } - - return apps.sorted { (lhs, rhs) in - switch ((bundleIDs.index(of: lhs.bundleIdentifier!)), bundleIDs.index(of: rhs.bundleIdentifier!)) { - case (nil, _): - return false; - case (_?, nil): - return true - case let (i1?, i2?): - return i1 < i2; - } - } -} - extension NSUserInterfaceItemIdentifier { static let scrubberApplicationsItem = NSUserInterfaceItemIdentifier("ScrubberApplicationsItemReuseIdentifier") }