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

fix issue "cant re-open mtmr after closing" close #117

Browse Source
This commit is contained in:
Toxblh 2018-10-14 18:10:38 +01:00
parent 06ecdfe016
commit bd2cd6d0b7
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MTMR/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.18.4</string> <string>0.18.5</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>35</string> <string>55</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string> <string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>

27
MTMR/TouchBarController.swift
View File

@ -83,8 +83,6 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
} }
} }
var touchbarNeedRefresh: Bool = true
var blacklistAppIdentifiers: [String] = [] var blacklistAppIdentifiers: [String] = []
var frontmostApplicationIdentifier: String? { var frontmostApplicationIdentifier: String? {
get { get {
@ -150,11 +148,13 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
func updateActiveApp() { func updateActiveApp() {
if self.blacklistAppIdentifiers.index(of: self.frontmostApplicationIdentifier!) != nil { if self.blacklistAppIdentifiers.index(of: self.frontmostApplicationIdentifier!) != nil {
DFRElementSetControlStripPresenceForIdentifier(.controlStripItem, false) dismissTouchBar()
self.touchbarNeedRefresh = true
} else { } else {
presentTouchBar() if self.showControlStripState {
self.touchbarNeedRefresh = false updateControlStripPresence()
} else {
presentSystemModal(touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem)
}
} }
} }
@ -172,7 +172,6 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
func reloadPreset(path: String) { func reloadPreset(path: String) {
lastPresetPath = path lastPresetPath = path
let items = path.fileData?.barItemDefinitions() ?? [BarItemDefinition(type: .staticButton(title: "bad preset"), action: .none, longAction: .none, additionalParameters: [:])] let items = path.fileData?.barItemDefinitions() ?? [BarItemDefinition(type: .staticButton(title: "bad preset"), action: .none, longAction: .none, additionalParameters: [:])]
touchbarNeedRefresh = true
createAndUpdatePreset(newJsonItems: items) createAndUpdatePreset(newJsonItems: items)
} }
@ -207,7 +206,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
let item = NSCustomTouchBarItem(identifier: .controlStripItem) let item = NSCustomTouchBarItem(identifier: .controlStripItem)
item.view = NSButton(image: #imageLiteral(resourceName: "StatusImage"), target: self, action: #selector(presentTouchBar)) item.view = NSButton(image: #imageLiteral(resourceName: "StatusImage"), target: self, action: #selector(presentTouchBar))
NSTouchBarItem.addSystemTrayItem(item) NSTouchBarItem.addSystemTrayItem(item)
DFRElementSetControlStripPresenceForIdentifier(.controlStripItem, true) updateControlStripPresence()
} }
func updateControlStripPresence() { func updateControlStripPresence() {
@ -215,18 +214,16 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
} }
@objc private func presentTouchBar() { @objc private func presentTouchBar() {
if touchbarNeedRefresh { if self.showControlStripState {
if self.showControlStripState { presentSystemModal(touchBar, systemTrayItemIdentifier: .controlStripItem)
presentSystemModal(touchBar, systemTrayItemIdentifier: .controlStripItem) } else {
} else { presentSystemModal(touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem)
presentSystemModal(touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem)
}
} }
} }
@objc private func dismissTouchBar() { @objc private func dismissTouchBar() {
self.touchbarNeedRefresh = true
minimizeSystemModal(touchBar) minimizeSystemModal(touchBar)
updateControlStripPresence()
} }
@objc func resetControlStrip() { @objc func resetControlStrip() {