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

Merge pull request #118 from ReDetection/fix-menu-checkmark

Browse Source 
Fix reversed "hide control strip" menu checkmark behaviour
This commit is contained in:
Anton Palgunov 2018-10-14 13:23:57 +01:00 committed by GitHub
commit 06ecdfe016
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MTMR/AppDelegate.swift
View File

@ -46,7 +46,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
} }
@objc func toggleControlStrip(_ sender: Any?) { @objc func toggleControlStrip(_ sender: Any?) {
TouchBarController.shared.controlStripState = !TouchBarController.shared.controlStripState TouchBarController.shared.showControlStripState = !TouchBarController.shared.showControlStripState
createMenu() createMenu()
TouchBarController.shared.resetControlStrip() TouchBarController.shared.resetControlStrip()
} }
@ -96,7 +96,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
startAtLogin.state = LaunchAtLoginController().launchAtLogin ? .on : .off startAtLogin.state = LaunchAtLoginController().launchAtLogin ? .on : .off
let hideControlStrip = NSMenuItem(title: "Hide Control Strip", action: #selector(toggleControlStrip(_:)), keyEquivalent: "T") let hideControlStrip = NSMenuItem(title: "Hide Control Strip", action: #selector(toggleControlStrip(_:)), keyEquivalent: "T")
hideControlStrip.state = TouchBarController.shared.controlStripState ? .on : .off hideControlStrip.state = TouchBarController.shared.showControlStripState ? .off : .on
let settingSeparator = NSMenuItem(title: "Settings", action: nil, keyEquivalent: "") let settingSeparator = NSMenuItem(title: "Settings", action: nil, keyEquivalent: "")
settingSeparator.isEnabled = false settingSeparator.isEnabled = false

6
MTMR/TouchBarController.swift
View File

@ -74,12 +74,12 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
var scrollArea: NSCustomTouchBarItem? var scrollArea: NSCustomTouchBarItem?
var centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString)) var centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString))
var controlStripState: Bool { var showControlStripState: Bool {
get { get {
return UserDefaults.standard.bool(forKey: "com.toxblh.mtmr.settings.showControlStrip") return UserDefaults.standard.bool(forKey: "com.toxblh.mtmr.settings.showControlStrip")
} }
set { set {
UserDefaults.standard.set(!controlStripState, forKey: "com.toxblh.mtmr.settings.showControlStrip") UserDefaults.standard.set(newValue, forKey: "com.toxblh.mtmr.settings.showControlStrip")
} }
} }
@ -216,7 +216,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
@objc private func presentTouchBar() { @objc private func presentTouchBar() {
if touchbarNeedRefresh { if touchbarNeedRefresh {
if self.controlStripState { 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)

2
MTMR/Widgets/GroupBarItem.swift
View File

@ -55,7 +55,7 @@ class GroupBarItem: NSPopoverTouchBarItem, NSTouchBarDelegate {
TouchBarController.shared.touchBar.defaultItemIdentifiers = [] TouchBarController.shared.touchBar.defaultItemIdentifiers = []
TouchBarController.shared.touchBar.defaultItemIdentifiers = self.leftIdentifiers + [centerScrollArea] + self.rightIdentifiers TouchBarController.shared.touchBar.defaultItemIdentifiers = self.leftIdentifiers + [centerScrollArea] + self.rightIdentifiers
if TouchBarController.shared.controlStripState { if TouchBarController.shared.showControlStripState {
presentSystemModal(TouchBarController.shared.touchBar, systemTrayItemIdentifier: .controlStripItem) presentSystemModal(TouchBarController.shared.touchBar, systemTrayItemIdentifier: .controlStripItem)
} else { } else {
presentSystemModal(TouchBarController.shared.touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem) presentSystemModal(TouchBarController.shared.touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem)