toxblh/MTMR
1
0
Fork 0
mirror of https://github.com/Toxblh/MTMR.git synced 2026-01-11 09:28:38 +00:00
Code Issues Releases Wiki Activity

* removed animation

Browse Source
This commit is contained in:
ad 2018-04-16 15:56:04 +03:00
parent 3d7bcd2d47
commit 69b3f9d238
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
MTMR/AppScrubberTouchBarItem.swift
View File

@ -47,7 +47,7 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didTerminateApplicationNotification, object: nil) NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didTerminateApplicationNotification, object: nil)
NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didActivateApplicationNotification, object: nil) NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didActivateApplicationNotification, object: nil)
updateRunningApplication(animated: false) updateRunningApplication()
} }
required init?(coder: NSCoder) { required init?(coder: NSCoder) {
@ -55,14 +55,14 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
} }
@objc func activeApplicationChanged(n: Notification) { @objc func activeApplicationChanged(n: Notification) {
updateRunningApplication(animated: true) updateRunningApplication()
} }
override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) { override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
updateRunningApplication(animated: false) updateRunningApplication()
} }
func updateRunningApplication(animated: Bool) { func updateRunningApplication() {
let isDockOrder = false let isDockOrder = false
let newApplications = (isDockOrder ? dockPersistentApplications() : launchedApplications()).filter { let newApplications = (isDockOrder ? dockPersistentApplications() : launchedApplications()).filter {
!$0.isTerminated && $0.bundleIdentifier != nil !$0.isTerminated && $0.bundleIdentifier != nil
@ -71,30 +71,10 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
let index = newApplications.index { let index = newApplications.index {
$0.processIdentifier == frontmost?.processIdentifier $0.processIdentifier == frontmost?.processIdentifier
} }
if animated {
scrubber.performSequentialBatchUpdates { runningApplications = newApplications
for (index, app) in newApplications.enumerated() { scrubber.reloadData()
while runningApplications[safe:index].map(newApplications.contains) == false {
scrubber.removeItems(at: [index])
let r = runningApplications.remove(at: index)
}
if let oldIndex = runningApplications.index(of: app) {
guard oldIndex != index else {
return
}
scrubber.moveItem(at: oldIndex, to: index)
runningApplications.move(at: oldIndex, to: index)
} else {
scrubber.insertItems(at: [index])
runningApplications.insert(app, at: index)
}
}
assert(runningApplications == newApplications)
}
} else {
runningApplications = newApplications
scrubber.reloadData()
}
scrubber.selectedIndex = index ?? 0 scrubber.selectedIndex = index ?? 0
} }