Title: [110058] trunk/Tools
- Revision
- 110058
- Author
- commit-qu...@webkit.org
- Date
- 2012-03-07 08:56:24 -0800 (Wed, 07 Mar 2012)
Log Message
[Qt] REGRESSION(r109575) Broke tap-to-zoom gesture
https://bugs.webkit.org/show_bug.cgi?id=80425
Patch by Dinu Jacob <dinu.ja...@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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (110057 => 110058)
--- trunk/Tools/ChangeLog 2012-03-07 16:52:17 UTC (rev 110057)
+++ trunk/Tools/ChangeLog 2012-03-07 16:56:24 UTC (rev 110058)
@@ -1,3 +1,17 @@
+2012-03-07 Dinu Jacob <dinu.ja...@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.hausm...@nokia.com>
[Qt] Windows build fix.
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (110057 => 110058)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-03-07 16:52:17 UTC (rev 110057)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-03-07 16:56:24 UTC (rev 110058)
@@ -159,6 +159,7 @@
} else {
touchPoint.setState(Qt::TouchPointPressed);
touchType = QEvent::TouchBegin;
+ m_startScreenPos = mouseEvent->screenPos();
}
break;
case QEvent::MouseMove:
@@ -192,6 +193,9 @@
Q_ASSERT_X(false, "multi-touch mocking", "unhandled event type");
}
+ // 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);
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h (110057 => 110058)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-03-07 16:52:17 UTC (rev 110057)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-03-07 16:56:24 UTC (rev 110058)
@@ -111,6 +111,7 @@
QPointF m_lastPos;
QPointF m_lastScreenPos;
+ QPointF m_startScreenPos;
QHash<int, QTouchEvent::TouchPoint> m_touchPoints;
QSet<int> m_heldTouchPoints;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
