luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-11-04 09:15:29 +01:00
Code Activity

Fix scrolling in scroll containers (#14702)

Browse Source
This commit is contained in:
Lars Müller
2024-06-03 20:38:09 +02:00
committed by GitHub
parent 75f3a2183f
commit ec9c000be9
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
irr/include/IEventReceiver.h
View File

@@ -331,7 +331,6 @@ struct SEvent
//! A bitmap of button states. You can use isButtonPressed() to determine
//! if a button is pressed or not.
//! Currently only valid if the event was EMIE_MOUSE_MOVED
u32 ButtonStates;
//! Is the left button pressed down?

2
irr/src/CIrrDeviceOSX.mm
View File

@@ -852,6 +852,7 @@ bool CIrrDeviceMacOSX::run()
ievent.MouseInput.Wheel *= 10.0f;
else
ievent.MouseInput.Wheel *= 5.0f;
ievent.MouseInput.ButtonStates = MouseButtonStates;
postMouseEvent(event, ievent);
break;
@@ -1048,6 +1049,7 @@ void CIrrDeviceMacOSX::storeMouseLocation()
ievent.MouseInput.Event = irr::EMIE_MOUSE_MOVED;
ievent.MouseInput.X = x;
ievent.MouseInput.Y = y;
ievent.MouseInput.ButtonStates = MouseButtonStates;
postEventFromUser(ievent);
}
}

1
irr/src/CIrrDeviceSDL.cpp
View File

@@ -667,6 +667,7 @@ bool CIrrDeviceSDL::run()
#else
irrevent.MouseInput.Wheel = SDL_event.wheel.y;
#endif
irrevent.MouseInput.ButtonStates = MouseButtonStates;
irrevent.MouseInput.Shift = (keymod & KMOD_SHIFT) != 0;
irrevent.MouseInput.Control = (keymod & KMOD_CTRL) != 0;
irrevent.MouseInput.X = MouseX;