[qtwebkit] Reset pan gesture recognizer on touch begin if pan active

sailfishos · May 30, 2014 · a107a96 · a107a96
1 parent 30bf5f5
commit a107a96
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/qtwebkit/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp b/qtwebkit/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
@@ -463,8 +463,11 @@ void QtWebPageEventHandler::handleInputEvent(const QInputEvent* event)
         switch (event->type()) {
         case QEvent::MouseButtonPress:
         case QEvent::TouchBegin:
-            m_viewportController->touchBegin();
+            if (m_panGestureRecognizer.isRecognized()) {
+                m_panGestureRecognizer.cancel();
+            }
 
+            m_viewportController->touchBegin();
             // The page viewport controller might still be animating kinetic scrolling or a scale animation
             // such as double-tap to zoom or the bounce back effect. A touch stops the kinetic scrolling
             // where as it does not stop the scale animation.