Showing the changes to libraries/script-engine/src/EventTypes.cpp (1 of 1 file). Show all
Unified · Split
| @@ -262,10 +262,17 @@ MouseEvent::MouseEvent() : · 261 unmodified lines | ||
| 262 | 262 | }; |
| 263 | 263 | |
| 264 | 264 | |
| 265 | −MouseEvent::MouseEvent(const QMouseEvent& event) { | |
| 266 | − x = event.x(); | |
| 267 | − y = event.y(); | |
| 268 | − | |
| 265 | +MouseEvent::MouseEvent(const QMouseEvent& event) : | |
| 266 | + x(event.x()), | |
| 267 | + y(event.y()), | |
| 268 | + isLeftButton(event.buttons().testFlag(Qt::LeftButton)), | |
| 269 | + isRightButton(event.buttons().testFlag(Qt::RightButton)), | |
| 270 | + isMiddleButton(event.buttons().testFlag(Qt::MiddleButton)), | |
| 271 | + isShifted(event.modifiers().testFlag(Qt::ShiftModifier)), | |
| 272 | + isControl(event.modifiers().testFlag(Qt::ControlModifier)), | |
| 273 | + isMeta(event.modifiers().testFlag(Qt::MetaModifier)), | |
| 274 | + isAlt(event.modifiers().testFlag(Qt::AltModifier)) | |
| 275 | +{ | |
| 269 | 276 | // single button that caused the event |
| 270 | 277 | switch (event.button()) { |
| 271 | 278 | case Qt::LeftButton: |
| @@ -284,16 +291,6 @@ MouseEvent::MouseEvent(const QMouseEvent& event) { · 12 unmodified lines | ||
| 284 | 291 | button = "NONE"; |
| 285 | 292 | break; |
| 286 | 293 | } |
| 287 | − // button pressed state | |
| 288 | − isLeftButton = isLeftButton || (event.buttons().testFlag(Qt::LeftButton)); | |
| 289 | − isRightButton = isRightButton || (event.buttons().testFlag(Qt::RightButton)); | |
| 290 | − isMiddleButton = isMiddleButton || (event.buttons().testFlag(Qt::MiddleButton)); | |
| 291 | − | |
| 292 | − // keyboard modifiers | |
| 293 | − isShifted = event.modifiers().testFlag(Qt::ShiftModifier); | |
| 294 | − isMeta = event.modifiers().testFlag(Qt::MetaModifier); | |
| 295 | − isControl = event.modifiers().testFlag(Qt::ControlModifier); | |
| 296 | − isAlt = event.modifiers().testFlag(Qt::AltModifier); | |
| 297 | 294 | } |
| 298 | 295 | |
| 299 | 296 | QScriptValue mouseEventToScriptValue(QScriptEngine* engine, const MouseEvent& event) { |