Fixed pinching in the imagegestures example.

When the gesture finishes it might not necessery set the ScaleFactorChanged
flag.

Also fixed the touch-event based pinch gesture.

Reviewed-by: trustme

1 files changed, 5 insertions, 6 deletions

diff --git a/examples/gestures/imagegestures/imagewidget.cpp b/examples/gestures/imagegestures/imagewidget.cpp
index 80bd6a6..afa0185 100644
--- a/examples/gestures/imagegestures/imagewidget.cpp
+++ b/examples/gestures/imagegestures/imagewidget.cpp
@@ -141,12 +141,11 @@ void ImageWidget::pinchTriggered(QPinchGesture *gesture)
     }
     if (changeFlags & QPinchGesture::ScaleFactorChanged) {
         qreal value = gesture->property("scaleFactor").toReal();
-        if (gesture->state() == Qt::GestureFinished) {
-            scaleFactor *= currentStepScaleFactor;
-            currentStepScaleFactor = 1;
-        } else {
-            currentStepScaleFactor = value;
-        }
+        currentStepScaleFactor = value;
+    }
+    if (gesture->state() == Qt::GestureFinished) {
+        scaleFactor *= currentStepScaleFactor;
+        currentStepScaleFactor = 1;
     }
     update();
 }