diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-30 12:20:04 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-04-07 22:34:36 +0200 |
| commit | bf205b45a29ba80d94df3b6bac5fec4c7cd79bf9 (patch) | |
| tree | b8576fbe1965eb4537bedb9366209624e65b13b4 | |
| parent | 0ebc0a321a4f40089318ab4a7bd31b84ffbf8393 (diff) | |
Avoid deprecated TouchPoint rect accessors in MPTA and QQWinPriv
Followup to 0124f73dfb779924e46eb8b319358dbbd5af2577
Change-Id: I8fa2e2fc8eae7a789a9d5e846f34c767c688b0e1
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/quick/items/qquickmultipointtoucharea.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index a854d97f7e..383718c979 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -789,7 +789,9 @@ void QQuickMultiPointTouchArea::updateTouchPoint(QQuickTouchPoint *dtp, const QT dtp->setPressure(p->pressure()); dtp->setRotation(p->rotation()); dtp->setVelocity(p->velocity()); - dtp->setArea(p->rect()); + QRectF area(QPointF(), p->ellipseDiameters()); + area.moveCenter(p->pos()); + dtp->setArea(area); dtp->setStartX(p->startPos().x()); dtp->setStartY(p->startPos().y()); dtp->setPreviousX(p->lastPos().x()); diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index de7a28d66e..50b166b18f 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -973,8 +973,7 @@ void QQuickWindowPrivate::translateTouchEvent(QTouchEvent *touchEvent) QList<QTouchEvent::TouchPoint> touchPoints = touchEvent->touchPoints(); for (int i = 0; i < touchPoints.count(); ++i) { QTouchEvent::TouchPoint &touchPoint = touchPoints[i]; - - touchPoint.setSceneRect(touchPoint.rect()); + touchPoint.setScenePos(touchPoint.pos()); touchPoint.setStartScenePos(touchPoint.startPos()); touchPoint.setLastScenePos(touchPoint.lastPos()); } |