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

Scroll Functionality Works

Browse Source
This commit is contained in:
jazzhpatel 2020-04-07 04:36:11 +05:30
parent a0fc0b33c5
commit 8309732470
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
MTMR/BasicView.swift
View File

@ -10,6 +10,7 @@ import Foundation
class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate { class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
var onefinger: NSPanGestureRecognizer!
var twofingers: NSPanGestureRecognizer! var twofingers: NSPanGestureRecognizer!
var threefingers: NSPanGestureRecognizer! var threefingers: NSPanGestureRecognizer!
var fourfingers: NSPanGestureRecognizer! var fourfingers: NSPanGestureRecognizer!
@ -30,6 +31,11 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
stackView.orientation = .horizontal stackView.orientation = .horizontal
view = stackView view = stackView
onefinger = NSPanGestureRecognizer(target: self, action: #selector(onefingerHandler(_:)))
onefinger.numberOfTouchesRequired = 1
onefinger.allowedTouchTypes = .direct
view.addGestureRecognizer(onefinger)
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
@ -57,9 +63,31 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
legacyPrevPositions[fingers] = position legacyPrevPositions[fingers] = position
case .changed: case .changed:
if self.legacyGesturesEnabled { if self.legacyGesturesEnabled {
if fingers == 1 {
let prevPos = legacyPrevPositions[fingers]!
if ((position - prevPos) > 3) || ((prevPos - position) > 3) {
if position > prevPos {
GenericKeyPress(keyCode: CGKeyCode(124)).send()
} else if position < prevPos {
GenericKeyPress(keyCode: CGKeyCode(123)).send()
}
legacyPrevPositions[fingers] = position
}
}
if fingers == 2 { if fingers == 2 {
let prevPos = legacyPrevPositions[fingers]! let prevPos = legacyPrevPositions[fingers]!
if ((position - prevPos) > 10) || ((prevPos - position) > 10) { if ((position - prevPos) > 50) || ((prevPos - position) > 50) {
if position > prevPos {
GenericKeyPress(keyCode: CGKeyCode(124)).send()
} else if position < prevPos {
GenericKeyPress(keyCode: CGKeyCode(123)).send()
}
legacyPrevPositions[fingers] = position
}
}
if fingers == 3 {
let prevPos = legacyPrevPositions[fingers]!
if ((position - prevPos) > 15) || ((prevPos - position) > 15) {
if position > prevPos { if position > prevPos {
HIDPostAuxKey(NX_KEYTYPE_SOUND_UP) HIDPostAuxKey(NX_KEYTYPE_SOUND_UP)
} else if position < prevPos { } else if position < prevPos {
@ -68,7 +96,7 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
legacyPrevPositions[fingers] = position legacyPrevPositions[fingers] = position
} }
} }
if fingers == 3 { if fingers == 4 {
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 {
@ -90,6 +118,11 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
} }
} }
@objc func onefingerHandler(_ sender: NSGestureRecognizer?) {
let position = (sender?.location(in: sender?.view).x)!
self.gestureHandler(position: position, fingers: 1, state: sender!.state)
}
@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.25</string> <string>0.25</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>385</string> <string>399</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>