Merge pull request #21 from ther0n/disable-mouse-accel-fix

Fixes issue #20
ther0n · Feb 4, 2021 · 0285073 · 0285073
2 parents 91cde77 + 0a6124e
commit 0285073
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/UnnaturalScrollWheels.xcodeproj/project.pbxproj b/UnnaturalScrollWheels.xcodeproj/project.pbxproj
@@ -313,7 +313,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.theron.UnnaturalScrollWheels;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "UnnaturalScrollWheels/UnnaturalScrollWheels-Bridging-Header.h";
@@ -339,7 +339,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.theron.UnnaturalScrollWheels;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "UnnaturalScrollWheels/UnnaturalScrollWheels-Bridging-Header.h";

diff --git a/UnnaturalScrollWheels/AppDelegate.swift b/UnnaturalScrollWheels/AppDelegate.swift
@@ -130,6 +130,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
             Options.shared.origAccel = origAccel
             UserDefaults.standard.set(origAccel, forKey: "OriginalAccel")
         }
+        if Options.shared.disableMouseAccel {
+            Options.shared.accel = -1
+        } else {
+            Options.shared.accel = Options.shared.origAccel
+        }
         // Set the mouse acceleration
         let accelNum: CFNumber = CFNumberCreate(kCFAllocatorDefault, CFNumberType.sInt32Type, &Options.shared.accel)
         IOHIDEventSystemClientSetProperty(client, mouseAccelerationType, accelNum)

diff --git a/UnnaturalScrollWheels/Info.plist b/UnnaturalScrollWheels/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>186</string>
+	<string>190</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/UnnaturalScrollWheels/PreferencesViewController.swift b/UnnaturalScrollWheels/PreferencesViewController.swift
@@ -58,11 +58,6 @@ class PreferencesViewController: NSViewController {
 
     @IBAction func disableMouseAccelClicked(_ sender: Any){
         Options.shared.disableMouseAccel = !Options.shared.disableMouseAccel
-        if Options.shared.disableMouseAccel {
-            Options.shared.accel = -1
-        } else {
-            Options.shared.accel = Options.shared.origAccel
-        }
         appDelegate?.disableMouseAccel()
     }