1
0
Fork 0

Fix bug 1286 - mouse scroll-wheel+shift ignored

On Mac, the OS is mapping shift+wheel to horizontal scrolling for
those of us without a mighty-mouse or trackpad. Detect this case
and map back to vertical scrolling inside FlightGear for the moment.

https://code.google.com/p/flightgear-bugs/issues/detail?id=1286
This commit is contained in:
James Turner 2014-01-13 21:08:32 +00:00
parent 061154d7a6
commit 9993e0a588

View file

@ -251,6 +251,18 @@ bool FGEventHandler::handle(const osgGA::GUIEventAdapter& ea,
button = 4;
else
button = -1;
#if defined(SG_MAC)
// bug https://code.google.com/p/flightgear-bugs/issues/detail?id=1286
// Mac (Cocoa) interprets shuft+wheel as horizontal scroll
if (ea.getModKeyMask() & osgGA::GUIEventAdapter::MODKEY_SHIFT) {
if (ea.getScrollingDeltaX() > 0)
button = 3;
else if (ea.getScrollingDeltaX() < 0)
button = 4;
}
#endif
} else if (ea.getScrollingMotion() == osgGA::GUIEventAdapter::SCROLL_UP)
button = 3;
else