diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-11-13 11:48:30 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-11-13 20:39:44 +0100 |
| commit | 538467c5d1f3b97bdc7fd11e1a7b552fd4f28a1b (patch) | |
| tree | 2b0662c6d035681dc0fc4be3695224c9c79317ca /src/quick/items | |
| parent | 0a9edf4d98d899dcc2f439b262b72361f5a06e79 (diff) | |
Add logging category qt.quick.pincharea
Change-Id: Iacfffdc774d5ea6980af7a29da07a82f17799e33
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickpincharea.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp index abb24dd6ca..b41815d88b 100644 --- a/src/quick/items/qquickpincharea.cpp +++ b/src/quick/items/qquickpincharea.cpp @@ -53,6 +53,8 @@ QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(lcPA, "qt.quick.pincharea") + /*! \qmltype PinchEvent \instantiates QQuickPinchEvent @@ -358,7 +360,7 @@ void QQuickPinchArea::touchEvent(QTouchEvent *event) void QQuickPinchArea::clearPinch(QTouchEvent *event) { Q_D(QQuickPinchArea); - + qCDebug(lcPA, "clear: %lld touchpoints", d->touchPoints.count()); d->touchPoints.clear(); if (d->inPinch) { d->inPinch = false; @@ -393,7 +395,7 @@ void QQuickPinchArea::clearPinch(QTouchEvent *event) void QQuickPinchArea::cancelPinch(QTouchEvent *event) { Q_D(QQuickPinchArea); - + qCDebug(lcPA, "cancel: %lld touchpoints", d->touchPoints.count()); d->touchPoints.clear(); if (d->inPinch) { d->inPinch = false; @@ -481,6 +483,8 @@ void QQuickPinchArea::updatePinch(QTouchEvent *event, bool filtering) if (touchPoint2.state() == QEventPoint::State::Pressed) d->sceneStartPoint2 = touchPoint2.scenePosition(); + qCDebug(lcPA) << "updating based on" << touchPoint1 << touchPoint2; + QRectF bounds = clipRect(); // Pinch is not started unless there are exactly two touch points // AND one or more of the points has just now been pressed (wasn't pressed already) @@ -489,6 +493,8 @@ void QQuickPinchArea::updatePinch(QTouchEvent *event, bool filtering) && (touchPoint1.state() == QEventPoint::State::Pressed || touchPoint2.state() == QEventPoint::State::Pressed) && bounds.contains(touchPoint1.position()) && bounds.contains(touchPoint2.position())) { d->id1 = touchPoint1.id(); + if (!d->pinchActivated) + qCDebug(lcPA, "pinch activating"); d->pinchActivated = true; d->initPinch = true; event->setExclusiveGrabber(touchPoint1, this); @@ -514,6 +520,8 @@ void QQuickPinchArea::updatePinch(QTouchEvent *event, bool filtering) d->id1 = touchPoint1.id(); if (angle > 180) angle -= 360; + qCDebug(lcPA, "pinch \u2316 %.1lf,%.1lf \u21e4%.1lf\u21e5 \u2220 %.1lf", + sceneCenter.x(), sceneCenter.y(), dist, angle); if (!d->inPinch || d->initPinch) { if (d->touchPoints.count() >= 2) { if (d->initPinch) { |