Fixes: NB#165100 - remove the custom pinch recognizer and use the Qt one.

RevBy: Tomas
Details: The custom gesture recognizer is not really necessary, and
it seems that it broke the fennec pinching gesture. The additional
acceptance of touch event in the image page is the drawback of using
the original Qt's gesture recognizer.

1 files changed, 13 insertions, 2 deletions

diff --git a/demos/widgetsgallery/imagepage.cpp b/demos/widgetsgallery/imagepage.cpp
index 05af36d2..f8957220 100644
--- a/demos/widgetsgallery/imagepage.cpp
+++ b/demos/widgetsgallery/imagepage.cpp
@@ -42,7 +42,8 @@ ImagePage::ImagePage() :
     propertiesComboBox(NULL),
     visual(NULL),
     image(NULL),
-    slider(NULL)
+    slider(NULL),
+    originalScaleFactor(10)
 {
     gid = TemplatePage::LayoutsAndVisuals;
 
@@ -64,6 +65,15 @@ QString ImagePage::timedemoTitle()
     return "Image";
 }
 
+bool ImagePage::event(QEvent *e)
+{
+    if (e->type() == QEvent::TouchBegin) {
+        e->setAccepted(true);
+        return true;
+    }
+    return TemplatePage::event(e);
+}
+
 void ImagePage::createContent()
 {
     MApplicationPage::createContent();
@@ -214,9 +224,10 @@ void ImagePage::pinchGestureEvent(QGestureEvent *event, QPinchGesture *gesture)
 {
     if (gesture->state() == Qt::GestureStarted) {
 	propertiesComboBox->setCurrentIndex(0);
+        originalScaleFactor = slider->value();
     }
 
-    slider->setValue(gesture->totalScaleFactor()/2);
+    slider->setValue(originalScaleFactor * gesture->scaleFactor());
 
     event->accept(gesture);