unwarp

Dev1an · Jan 21, 2018 · ff2e390 · ff2e390
1 parent 688888f
commit ff2e390
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Magic Drumpad/Info.plist b/Magic Drumpad/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>7</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.music</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Magic Drumpad/ViewController.swift b/Magic Drumpad/ViewController.swift
@@ -128,18 +128,26 @@ class ViewController: NSViewController {
 		}
 	}
 
+	var mousePosition = CGPoint.zero
+
 	func lockMouse() {
 		CGDisplayHideCursor(.init(0))
 		CGAssociateMouseAndMouseCursorPosition(0)
+		mousePosition = view.window?.convertToGlobal( NSEvent.mouseLocation() ) ?? .zero
 		CGWarpMouseCursorPosition(CGPoint(
 			x: NSEvent.mouseLocation().x,
-			y: view.window?.convertToGlobal(view.convert(lockButton.frame.origin, to: nil))?.y ?? 100
+			y: view.window?.convertToGlobal(
+				view.window?.convertToScreen(
+					view.convert(lockButton.frame, to: nil)
+				).origin ?? .zero
+			)?.y ?? 100
 		))
 		lockButton.keyEquivalent = escape
 		lockButton.title = "Press escape to unlock mouse"
 	}
 
 	func unlockMouse() {
+		CGWarpMouseCursorPosition(mousePosition)
 		CGDisplayShowCursor(.init(0))
 		CGAssociateMouseAndMouseCursorPosition(1)
 		lockButton.title = "Lock mouse"
@@ -153,7 +161,7 @@ extension NSWindow {
 		if let screen = screen {
 			return CGPoint(
 				x: point.x,
-				y: screen.frame.maxY - convertToScreen(NSRect(origin: point, size: .zero)).origin.y
+				y: screen.frame.maxY - point.y
 			)
 		} else {
 			return nil