MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OSX: Fix scrolling

master
MoNTE48 2021-12-26 02:13:03 +01:00
parent 499dbb6f2a
commit b889ec9334
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/IEventReceiver.h
View File

@ -115,7 +115,6 @@ namespace irr
//! The mouse wheel was moved. Use Wheel value in event data to find out
//! in what direction and how fast.
EMIE_MOUSE_WHEEL,
EMIE_MOUSE_WHEEL_X, // only for OSX!
//! Left mouse button double click.
//! This event is generated after the second EMIE_LMOUSE_PRESSED_DOWN event.

14
source/Irrlicht/CIrrDeviceOSX.mm
View File

@ -1079,19 +1079,9 @@ bool CIrrDeviceMacOSX::run()
case NSScrollWheel:
ievent.EventType = irr::EET_MOUSE_INPUT_EVENT;
// MultiCraft specific thing to smoothly change HUD items,
// using the side scrolling on the touchpad
if ([event deltaX] != 0) {
ievent.MouseInput.Event = irr::EMIE_MOUSE_WHEEL_X;
ievent.MouseInput.Wheel = (s32) [event deltaX];
postMouseEvent(event,ievent);
break;
}
ievent.MouseInput.Event = irr::EMIE_MOUSE_WHEEL;
ievent.MouseInput.Wheel = (s32) [event deltaY];
if (ievent.MouseInput.Wheel < 1.0f)
ievent.MouseInput.Wheel *= 10.0f;
else
ievent.MouseInput.Wheel = (s32) (-[event scrollingDeltaX] + [event scrollingDeltaY]);
if (([event phase] == NSEventPhaseNone) || ([event momentumPhase] == NSEventPhaseNone))
ievent.MouseInput.Wheel *= 5.0f;
postMouseEvent(event,ievent);
break;