Changeset 110058 in webkit

Timestamp:

Mar 7, 2012 8:56:24 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] REGRESSION(r109575) Broke tap-to-zoom gesture
​https://bugs.webkit.org/show_bug.cgi?id=80425

Patch by Dinu Jacob <​dinu.jacob@nokia.com> on 2012-03-07
Reviewed by Simon Hausmann.

Set startScreenPos in mock touch point

• MiniBrowser/qt/MiniBrowserApplication.cpp:

(MiniBrowserApplication::notify):

• MiniBrowser/qt/MiniBrowserApplication.h:

(MiniBrowserApplication):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/qt/MiniBrowserApplication.cpp (modified) (2 diffs)
• MiniBrowser/qt/MiniBrowserApplication.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-07  Dinu Jacob  <dinu.jacob@nokia.com>
+
+        [Qt] REGRESSION(r109575) Broke tap-to-zoom gesture
+        https://bugs.webkit.org/show_bug.cgi?id=80425
+
+        Reviewed by Simon Hausmann.
+
+        Set startScreenPos in mock touch point
+
+        * MiniBrowser/qt/MiniBrowserApplication.cpp:
+        (MiniBrowserApplication::notify):
+        * MiniBrowser/qt/MiniBrowserApplication.h:
+        (MiniBrowserApplication):
+
 2012-03-07  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp

@@ -160 +160 @@
                 touchPoint.setState(Qt::TouchPointPressed);
                 touchType = QEvent::TouchBegin;
+                m_startScreenPos = mouseEvent->screenPos();
             }
             break;
@@ -193 +194 @@
         }
 
+        // Set the screen pos as the scene pos as canvas translates the touch events.
+        touchPoint.setStartScenePos(m_startScreenPos);
+
         // Update current touch-point
         m_touchPoints.insert(touchPoint.id(), touchPoint);

trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h

@@ -112 +112 @@
     QPointF m_lastPos;
     QPointF m_lastScreenPos;
+    QPointF m_startScreenPos;
 
     QHash<int, QTouchEvent::TouchPoint> m_touchPoints;