Showing the changes to libraries/script-engine/src/EventTypes.cpp (1 of 9 files). Show all
Unified · Split
| @@ -298,9 +298,10 @@ MouseEvent::MouseEvent() : · 297 unmodified lines | ||
| 298 | 298 | }; |
| 299 | 299 | |
| 300 | 300 | |
| 301 | −MouseEvent::MouseEvent(const QMouseEvent& event) : | |
| 301 | +MouseEvent::MouseEvent(const QMouseEvent& event, const unsigned int deviceID) : | |
| 302 | 302 | x(event.x()), |
| 303 | 303 | y(event.y()), |
| 304 | + deviceID(deviceID), | |
| 304 | 305 | isLeftButton(event.buttons().testFlag(Qt::LeftButton)), |
| 305 | 306 | isRightButton(event.buttons().testFlag(Qt::RightButton)), |
| 306 | 307 | isMiddleButton(event.buttons().testFlag(Qt::MiddleButton)), |
| @@ -334,6 +335,7 @@ QScriptValue mouseEventToScriptValue(QScriptEngine* engine, const MouseEvent& ev · 27 unmodified lines | ||
| 334 | 335 | obj.setProperty("x", event.x); |
| 335 | 336 | obj.setProperty("y", event.y); |
| 336 | 337 | obj.setProperty("button", event.button); |
| 338 | + obj.setProperty("deviceID", event.deviceID); | |
| 337 | 339 | obj.setProperty("isLeftButton", event.isLeftButton); |
| 338 | 340 | obj.setProperty("isRightButton", event.isRightButton); |
| 339 | 341 | obj.setProperty("isMiddleButton", event.isMiddleButton); |