diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-09-12 15:03:37 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-09-12 16:23:09 +0000 |
| commit | 7236b0dfdb9ae805f4ba595def2b696859aa3613 (patch) | |
| tree | 0146c184ac7c5f70a696104f3e007230b6259bde /src | |
| parent | 1f77d1b36d3b28abcb53fc7df400bd095ea14c9d (diff) | |
PinchHandler: correct the usage of min/max x/y for movement bounds
QRectF constructor takes x, y, width, height not x1, y1, x2, y2
Change-Id: I84f9e62ef7a6587a319ed33d8937365f94fdba3b
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/handlers/qquickpinchhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/handlers/qquickpinchhandler.cpp b/src/quick/handlers/qquickpinchhandler.cpp index b1a5779981..2cc5135147 100644 --- a/src/quick/handlers/qquickpinchhandler.cpp +++ b/src/quick/handlers/qquickpinchhandler.cpp @@ -247,7 +247,7 @@ void QQuickPinchHandler::handlePointerEventImpl(QQuickPointerEvent *event) // TODO check m_pinchOrigin: right now it acts like it's set to PinchCenter m_centroid = touchPointCentroid(); m_centroidVelocity = touchPointCentroidVelocity(); - QRectF bounds(m_minimumX, m_minimumY, m_maximumX, m_maximumY); + QRectF bounds(m_minimumX, m_minimumY, m_maximumX - m_minimumX, m_maximumY - m_minimumY); // avoid mapping the minima and maxima, as they might have unmappable values // such as -inf/+inf. Because of this we perform the bounding to min/max in local coords. QPointF centroidParentPos; |