Platform/Event: Add x/y mouse position to MouseWheelEvent

This commit is contained in:
Lynix 2019-07-05 22:17:22 +02:00
parent 2c3bf482de
commit 37c16dc202
4 changed files with 13 additions and 2 deletions

View File

@ -189,6 +189,7 @@ Nazara Engine:
- ⚠ TextSprite will now use multiple render layers by itself (the current one and the one right before, ex: [-1, 0] if base layer is 0) if you use text outlines.
- ⚠ SimpleTextDrawer no longer supports faux bold rendering
- Added PhysWorld2D::[RaycastQuery, RegionQuery] overloads taking a callback
- Added x and y mouse position to MouseWheelEvent
Nazara Development Kit:
- Added ImageWidget (#139)

View File

@ -55,6 +55,8 @@ namespace Nz
struct MouseWheelEvent
{
float delta;
int x;
int y;
};
// Used by:

View File

@ -712,7 +712,10 @@ namespace Nz
{
WindowEvent event;
event.type = WindowEventType_MouseWheelMoved;
event.mouseWheel.delta = static_cast<float>(GET_WHEEL_DELTA_WPARAM(wParam))/WHEEL_DELTA;
event.mouseWheel.delta = static_cast<float>(GET_WHEEL_DELTA_WPARAM(wParam)) / WHEEL_DELTA;
event.mouseWheel.x = GET_X_LPARAM(lParam);
event.mouseWheel.y = GET_Y_LPARAM(lParam);
m_parent->PushEvent(event);
}
else
@ -722,7 +725,10 @@ namespace Nz
{
WindowEvent event;
event.type = WindowEventType_MouseWheelMoved;
event.mouseWheel.delta = static_cast<float>(m_scrolling/WHEEL_DELTA);
event.mouseWheel.delta = static_cast<float>(m_scrolling / WHEEL_DELTA);
event.mouseWheel.x = GET_X_LPARAM(lParam);
event.mouseWheel.y = GET_Y_LPARAM(lParam);
m_parent->PushEvent(event);
m_scrolling %= WHEEL_DELTA;

View File

@ -1233,6 +1233,8 @@ namespace Nz
{
event.type = Nz::WindowEventType_MouseWheelMoved;
event.mouseWheel.delta = (buttonReleaseEvent->detail == XCB_BUTTON_INDEX_4) ? 1 : -1;
event.mouseWheel.x = buttonReleaseEvent->event_x;
event.mouseWheel.y = buttonReleaseEvent->event_y;
break;
}
default: