Platform/Event: Add x/y mouse position to MouseWheelEvent
This commit is contained in:
parent
2c3bf482de
commit
37c16dc202
|
|
@ -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.
|
- ⚠ 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
|
- ⚠ SimpleTextDrawer no longer supports faux bold rendering
|
||||||
- Added PhysWorld2D::[RaycastQuery, RegionQuery] overloads taking a callback
|
- Added PhysWorld2D::[RaycastQuery, RegionQuery] overloads taking a callback
|
||||||
|
- Added x and y mouse position to MouseWheelEvent
|
||||||
|
|
||||||
Nazara Development Kit:
|
Nazara Development Kit:
|
||||||
- Added ImageWidget (#139)
|
- Added ImageWidget (#139)
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,8 @@ namespace Nz
|
||||||
struct MouseWheelEvent
|
struct MouseWheelEvent
|
||||||
{
|
{
|
||||||
float delta;
|
float delta;
|
||||||
|
int x;
|
||||||
|
int y;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Used by:
|
// Used by:
|
||||||
|
|
|
||||||
|
|
@ -713,6 +713,9 @@ namespace Nz
|
||||||
WindowEvent event;
|
WindowEvent event;
|
||||||
event.type = WindowEventType_MouseWheelMoved;
|
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);
|
m_parent->PushEvent(event);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -723,6 +726,9 @@ namespace Nz
|
||||||
WindowEvent event;
|
WindowEvent event;
|
||||||
event.type = WindowEventType_MouseWheelMoved;
|
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_parent->PushEvent(event);
|
||||||
|
|
||||||
m_scrolling %= WHEEL_DELTA;
|
m_scrolling %= WHEEL_DELTA;
|
||||||
|
|
|
||||||
|
|
@ -1233,6 +1233,8 @@ namespace Nz
|
||||||
{
|
{
|
||||||
event.type = Nz::WindowEventType_MouseWheelMoved;
|
event.type = Nz::WindowEventType_MouseWheelMoved;
|
||||||
event.mouseWheel.delta = (buttonReleaseEvent->detail == XCB_BUTTON_INDEX_4) ? 1 : -1;
|
event.mouseWheel.delta = (buttonReleaseEvent->detail == XCB_BUTTON_INDEX_4) ? 1 : -1;
|
||||||
|
event.mouseWheel.x = buttonReleaseEvent->event_x;
|
||||||
|
event.mouseWheel.y = buttonReleaseEvent->event_y;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue