Fixed merge conflict #3992

symless · Jun 30, 2015 · 57762f7 · 57762f7
2 parents 673fba5 + 965495d
commit 57762f7
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/lib/platform/OSXScreen.cpp b/src/lib/platform/OSXScreen.cpp
@@ -531,7 +531,23 @@ OSXScreen::postMouseEvent(CGPoint& pos) const
     // Fix for sticky keys
     CGEventFlags modifiers = m_keyState->getModifierStateAsOSXFlags();
     CGEventSetFlags(event, modifiers);
+
+    // Set movement deltas to fix issues with certain 3D programs
+    SInt64 deltaX = pos.x;
+    deltaX -= m_xCursor;
+
+    SInt64 deltaY = pos.y;
+    deltaY -= m_yCursor;
+
+    CGEventSetIntegerValueField(event, kCGMouseEventDeltaX, deltaX);
+    CGEventSetIntegerValueField(event, kCGMouseEventDeltaY, deltaY);
 
+    double deltaFX = deltaX;
+    double deltaFY = deltaY;
+
+    CGEventSetDoubleValueField(event, kCGMouseEventDeltaX, deltaFX);
+    CGEventSetDoubleValueField(event, kCGMouseEventDeltaY, deltaFY);
+
 	CGEventPost(kCGHIDEventTap, event);
 
 	CFRelease(event);