From 83097324707e708e9f23661d75b7beb9364384b5 Mon Sep 17 00:00:00 2001
From: jazzhpatel <jazzhpatel@gmail.com>
Date: Tue, 7 Apr 2020 04:36:11 +0530
Subject: [PATCH] Scroll Functionality Works

---
 MTMR/BasicView.swift | 37 +++++++++++++++++++++++++++++++++++--
 MTMR/Info.plist      |  2 +-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/MTMR/BasicView.swift b/MTMR/BasicView.swift
index ce30af8..5d388cb 100644
--- a/MTMR/BasicView.swift
+++ b/MTMR/BasicView.swift
@@ -10,6 +10,7 @@ import Foundation
 
 
 class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
+    var onefinger: NSPanGestureRecognizer!
     var twofingers: NSPanGestureRecognizer!
     var threefingers: NSPanGestureRecognizer!
     var fourfingers: NSPanGestureRecognizer!
@@ -30,6 +31,11 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
         stackView.orientation = .horizontal
         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.numberOfTouchesRequired = 2
         twofingers.allowedTouchTypes = .direct
@@ -57,9 +63,31 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
             legacyPrevPositions[fingers] = position
         case .changed:
             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 {
                     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 {
                             HIDPostAuxKey(NX_KEYTYPE_SOUND_UP)
                         } else if position < prevPos {
@@ -68,7 +96,7 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
                         legacyPrevPositions[fingers] = position
                     }
                 }
-                if fingers == 3 {
+                if fingers == 4 {
                     let prevPos = legacyPrevPositions[fingers]!
                     if ((position - prevPos) > 15) || ((prevPos - position) > 15) {
                         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?) {
         let position = (sender?.location(in: sender?.view).x)!
         self.gestureHandler(position: position, fingers: 2, state: sender!.state)
diff --git a/MTMR/Info.plist b/MTMR/Info.plist
index 8ee6ef2..323fcf8 100644
--- a/MTMR/Info.plist
+++ b/MTMR/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.25</string>
 	<key>CFBundleVersion</key>
-	<string>385</string>
+	<string>399</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>