Implement ScrollWheel functionality again
This commit is contained in:
parent
9a968e8c41
commit
b5a87d818e
|
@ -188,7 +188,7 @@ final class MacOSXNativeMouse extends EventQueue {
|
|||
setCursorPos(x, y, nanos);
|
||||
}
|
||||
if ( dz != 0 ) {
|
||||
int wheel_amount = (int)(-dz * WHEEL_SCALE);
|
||||
int wheel_amount = (int)(-dy * WHEEL_SCALE);
|
||||
accum_dz += wheel_amount;
|
||||
putMouseEvent((byte)-1, (byte)0, wheel_amount, nanos);
|
||||
}
|
||||
|
|
|
@ -327,7 +327,7 @@ static NSAutoreleasePool *pool;
|
|||
jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
|
||||
jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
|
||||
NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
|
||||
(*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 0.0f, time);
|
||||
(*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 0.0f, time);
|
||||
}
|
||||
|
||||
- (void)scrollWheel:(NSEvent *)event {
|
||||
|
@ -340,10 +340,10 @@ static NSAutoreleasePool *pool;
|
|||
//if (![event hasPreciseScrollingDeltas]) { // Also an OS X 10.7 API
|
||||
// dz *= 12; // or so
|
||||
//}
|
||||
//jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
|
||||
//jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
|
||||
//NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
|
||||
//(*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], dz, time);
|
||||
jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
|
||||
jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
|
||||
NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
|
||||
(*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 1.0f, time);
|
||||
}
|
||||
|
||||
- (void)viewDidMoveToWindow
|
||||
|
|
Loading…
Reference in New Issue