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

Change brightness for 3 finger gesture. Close #370, #372

Browse Source
This commit is contained in:
Anton Palgunov 2020-11-19 21:32:35 +00:00
parent 6660bb2d8f
commit 54eaa3fd9f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MTMR/BasicView.swift
View File

@ -15,12 +15,12 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
var fourfingers: NSPanGestureRecognizer! var fourfingers: NSPanGestureRecognizer!
var swipeItems: [SwipeItem] = [] var swipeItems: [SwipeItem] = []
var prevPositions: [Int: CGFloat] = [2:0, 3:0, 4:0] var prevPositions: [Int: CGFloat] = [2:0, 3:0, 4:0]
// legacy gesture positions // legacy gesture positions
// by legacy I mean gestures to increse/decrease volume/brigtness which can be checked from app menu // by legacy I mean gestures to increse/decrease volume/brigtness which can be checked from app menu
var legacyPrevPositions: [Int: CGFloat] = [2:0, 3:0, 4:0] var legacyPrevPositions: [Int: CGFloat] = [2:0, 3:0, 4:0]
var legacyGesturesEnabled = false var legacyGesturesEnabled = false
init(identifier: NSTouchBarItem.Identifier, items: [NSTouchBarItem], swipeItems: [SwipeItem]) { init(identifier: NSTouchBarItem.Identifier, items: [NSTouchBarItem], swipeItems: [SwipeItem]) {
super.init(identifier: identifier) super.init(identifier: identifier)
self.swipeItems = swipeItems self.swipeItems = swipeItems
@ -29,27 +29,27 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
stackView.spacing = 8 stackView.spacing = 8
stackView.orientation = .horizontal stackView.orientation = .horizontal
view = stackView view = stackView
twofingers = NSPanGestureRecognizer(target: self, action: #selector(twofingersHandler(_:))) twofingers = NSPanGestureRecognizer(target: self, action: #selector(twofingersHandler(_:)))
twofingers.numberOfTouchesRequired = 2 twofingers.numberOfTouchesRequired = 2
twofingers.allowedTouchTypes = .direct twofingers.allowedTouchTypes = .direct
view.addGestureRecognizer(twofingers) view.addGestureRecognizer(twofingers)
threefingers = NSPanGestureRecognizer(target: self, action: #selector(threefingersHandler(_:))) threefingers = NSPanGestureRecognizer(target: self, action: #selector(threefingersHandler(_:)))
threefingers.numberOfTouchesRequired = 3 threefingers.numberOfTouchesRequired = 3
threefingers.allowedTouchTypes = .direct threefingers.allowedTouchTypes = .direct
view.addGestureRecognizer(threefingers) view.addGestureRecognizer(threefingers)
fourfingers = NSPanGestureRecognizer(target: self, action: #selector(fourfingersHandler(_:))) fourfingers = NSPanGestureRecognizer(target: self, action: #selector(fourfingersHandler(_:)))
fourfingers.numberOfTouchesRequired = 4 fourfingers.numberOfTouchesRequired = 4
fourfingers.allowedTouchTypes = .direct fourfingers.allowedTouchTypes = .direct
view.addGestureRecognizer(fourfingers) view.addGestureRecognizer(fourfingers)
} }
required init?(coder _: NSCoder) { required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
func gestureHandler(position: CGFloat, fingers: Int, state: NSGestureRecognizer.State) { func gestureHandler(position: CGFloat, fingers: Int, state: NSGestureRecognizer.State) {
switch state { switch state {
case .began: case .began:
@ -72,9 +72,9 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
let prevPos = legacyPrevPositions[fingers]! let prevPos = legacyPrevPositions[fingers]!
if ((position - prevPos) > 15) || ((prevPos - position) > 15) { if ((position - prevPos) > 15) || ((prevPos - position) > 15) {
if position > prevPos { if position > prevPos {
GenericKeyPress(keyCode: CGKeyCode(144)).send() HIDPostAuxKey(NX_KEYTYPE_BRIGHTNESS_UP)
} else if position < prevPos { } else if position < prevPos {
GenericKeyPress(keyCode: CGKeyCode(145)).send() HIDPostAuxKey(NX_KEYTYPE_BRIGHTNESS_DOWN)
} }
legacyPrevPositions[fingers] = position legacyPrevPositions[fingers] = position
} }
@ -89,7 +89,7 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
break break
} }
} }
@objc func twofingersHandler(_ sender: NSGestureRecognizer?) { @objc func twofingersHandler(_ sender: NSGestureRecognizer?) {
let position = (sender?.location(in: sender?.view).x)! let position = (sender?.location(in: sender?.view).x)!
self.gestureHandler(position: position, fingers: 2, state: sender!.state) self.gestureHandler(position: position, fingers: 2, state: sender!.state)

2
MTMR/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.26.1</string> <string>0.26.1</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>425</string> <string>428</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>