Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 18:06:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replace usage of deprecated QWheelEvent members

Browse source
This commit is contained in:
Dale Glass 2022-06-05 13:23:25 +02:00
parent 044f08b931
commit 8a12bf1749
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/qml/src/qml/OffscreenSurface.cpp
View file

@ -173,9 +173,13 @@ bool OffscreenSurface::eventFilter(QObject* originalDestination, QEvent* event)
case QEvent::Wheel: { case QEvent::Wheel: {
QWheelEvent* wheelEvent = static_cast<QWheelEvent*>(event); QWheelEvent* wheelEvent = static_cast<QWheelEvent*>(event);
QPointF transformedPos = mapToVirtualScreen(wheelEvent->pos()); QPointF transformedPos = mapToVirtualScreen(wheelEvent->position());
QWheelEvent mappedEvent(transformedPos, wheelEvent->delta(), wheelEvent->buttons(), wheelEvent->modifiers(),
wheelEvent->orientation());
QWheelEvent mappedEvent(transformedPos, wheelEvent->globalPosition(), wheelEvent->pixelDelta(), wheelEvent->angleDelta(),
wheelEvent->buttons(), wheelEvent->modifiers(), wheelEvent->phase(),
wheelEvent->inverted(), wheelEvent->source());
mappedEvent.ignore(); mappedEvent.ignore();
if (QCoreApplication::sendEvent(_sharedObject->getWindow(), &mappedEvent)) { if (QCoreApplication::sendEvent(_sharedObject->getWindow(), &mappedEvent)) {
return mappedEvent.isAccepted(); return mappedEvent.isAccepted();

15
libraries/script-engine/src/WheelEvent.cpp
View file

@ -27,25 +27,24 @@ WheelEvent::WheelEvent() :
isMeta(false), isMeta(false),
isAlt(false) isAlt(false)
{ {
} }
WheelEvent::WheelEvent(const QWheelEvent& event) { WheelEvent::WheelEvent(const QWheelEvent& event) {
x = event.x(); x = event.position().x();
y = event.y(); y = event.position().y();
delta = event.delta(); if (event.angleDelta().x() != 0) {
if (event.orientation() == Qt::Horizontal) {
orientation = "HORIZONTAL"; orientation = "HORIZONTAL";
} else { } else {
orientation = "VERTICAL"; orientation = "VERTICAL";
} }
// button pressed state // button pressed state
isLeftButton = (event.buttons().testFlag(Qt::LeftButton)); isLeftButton = (event.buttons().testFlag(Qt::LeftButton));
isRightButton = (event.buttons().testFlag(Qt::RightButton)); isRightButton = (event.buttons().testFlag(Qt::RightButton));
isMiddleButton = (event.buttons().testFlag(Qt::MiddleButton)); isMiddleButton = (event.buttons().testFlag(Qt::MiddleButton));
// keyboard modifiers // keyboard modifiers
isShifted = event.modifiers().testFlag(Qt::ShiftModifier); isShifted = event.modifiers().testFlag(Qt::ShiftModifier);
isMeta = event.modifiers().testFlag(Qt::MetaModifier); isMeta = event.modifiers().testFlag(Qt::MetaModifier);