mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for PR#86: mousewheel simultaneous X and Y scrolling under OS X .

Browse Source 
Thanks to the OP for most of the fix.
This commit is contained in:
ManoloFLTK 2020-06-02 19:44:57 +02:00
parent 09ee1c0b9c
commit f9a63b5ed5
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Fl_cocoa.mm
View File

@ -922,35 +922,24 @@ static void cocoaMouseWheelHandler(NSEvent *theEvent)
// to me why Apple changed the API on this even though the current API
// supports two wheels just fine. Matthias,
fl_lock_function();
Fl_Window *window = (Fl_Window*)[(FLWindow*)[theEvent window] getFl_Window];
if ( !window->shown() ) {
fl_unlock_function();
return;
}
Fl::first_window(window);
// Under OSX, single mousewheel increments are 0.1,
// so make sure they show up as at least 1..
//
float dx = [theEvent deltaX]; if ( fabs(dx) < 1.0 ) dx = (dx > 0) ? 1.0 : -1.0;
float dy = [theEvent deltaY]; if ( fabs(dy) < 1.0 ) dy = (dy > 0) ? 1.0 : -1.0;
if ([theEvent deltaX] != 0) {
Fl::e_dx = (int)-dx;
// Under OSX, mousewheel deltas are floats, but fltk only supports ints.
float s = Fl::screen_driver()->scale(0);
int dx = roundf([theEvent deltaX] / s);
int dy = roundf([theEvent deltaY] / s);
// allow both horizontal and vertical movements to be processed by the widget
if (dx) {
Fl::e_dx = -dx;
Fl::e_dy = 0;
if ( Fl::e_dx) Fl::handle( FL_MOUSEWHEEL, window );
} else if ([theEvent deltaY] != 0) {
Fl::e_dx = 0;
Fl::e_dy = (int)-dy;
if ( Fl::e_dy) Fl::handle( FL_MOUSEWHEEL, window );
} else {
fl_unlock_function();
return;
Fl::handle( FL_MOUSEWHEEL, window );
}
if (dy) {
Fl::e_dx = 0;
Fl::e_dy = -dy;
Fl::handle( FL_MOUSEWHEEL, window );
}
fl_unlock_function();
// return noErr;
}
/*