Title: [116648] trunk/Source/WebKit2
- Revision
- 116648
- Author
- [email protected]
- Date
- 2012-05-10 08:35:02 -0700 (Thu, 10 May 2012)
Log Message
[Qt] Double tap to zoom is considered a user interaction
https://bugs.webkit.org/show_bug.cgi?id=86094
Reviewed by Simon Hausmann.
This makes it so that the content size change doesn't change scale
after a double tap to zoom.
* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::QtViewportInteractionEngine::zoomToAreaGestureEnded):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (116647 => 116648)
--- trunk/Source/WebKit2/ChangeLog 2012-05-10 15:22:04 UTC (rev 116647)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-10 15:35:02 UTC (rev 116648)
@@ -1,3 +1,16 @@
+2012-05-10 Kenneth Rohde Christiansen <[email protected]>
+
+ [Qt] Double tap to zoom is considered a user interaction
+ https://bugs.webkit.org/show_bug.cgi?id=86094
+
+ Reviewed by Simon Hausmann.
+
+ This makes it so that the content size change doesn't change scale
+ after a double tap to zoom.
+
+ * UIProcess/qt/QtViewportInteractionEngine.cpp:
+ (WebKit::QtViewportInteractionEngine::zoomToAreaGestureEnded):
+
2012-05-10 Kent Hansen <[email protected]>
[Qt] Rename QDeclarative* to QQml*
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (116647 => 116648)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2012-05-10 15:22:04 UTC (rev 116647)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2012-05-10 15:35:02 UTC (rev 116648)
@@ -365,6 +365,8 @@
if (scrollAnimationActive() || scaleAnimationActive())
return;
+ m_hadUserInteraction = true;
+
const int margin = 10; // We want at least a little bit of margin.
QRectF endArea = itemRectFromCSS(targetArea.adjusted(-margin, -margin, margin, margin));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
