Changeset 114370 in webkit

Timestamp:

Apr 17, 2012, 6:14:50 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Zoom out on second double-tap.
​https://bugs.webkit.org/show_bug.cgi?id=84145

Patch by Allan Sandfeld Jensen <​allan.jensen@nokia.com> on 2012-04-17
Reviewed by Simon Hausmann.

• UIProcess/qt/QtViewportInteractionEngine.cpp:

(WebKit::QtViewportInteractionEngine::QtViewportInteractionEngine):
(WebKit::QtViewportInteractionEngine::zoomToAreaGestureEnded):
(WebKit::QtViewportInteractionEngine::pinchGestureStarted):

• UIProcess/qt/QtViewportInteractionEngine.h:

(QtViewportInteractionEngine):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/QtViewportInteractionEngine.cpp (modified) (4 diffs)
• UIProcess/qt/QtViewportInteractionEngine.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-04-17  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        [Qt] Zoom out on second double-tap.
+        https://bugs.webkit.org/show_bug.cgi?id=84145
+
+        Reviewed by Simon Hausmann.
+
+        * UIProcess/qt/QtViewportInteractionEngine.cpp:
+        (WebKit::QtViewportInteractionEngine::QtViewportInteractionEngine):
+        (WebKit::QtViewportInteractionEngine::zoomToAreaGestureEnded):
+        (WebKit::QtViewportInteractionEngine::pinchGestureStarted):
+        * UIProcess/qt/QtViewportInteractionEngine.h:
+        (QtViewportInteractionEngine):
+
 2012-04-17  Mariusz Grzegorczyk  <mariusz.g@samsung.com>
 

trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp

@@ -126 +126 @@
     , m_hasSuspendedContent(false)
     , m_hadUserInteraction(false)
+    , m_zoomedToArea(false)
     , m_scaleAnimation(new ScaleAnimation(this))
     , m_pinchStartScale(-1)
@@ -364 +365 @@
         return;
 
-    const int margin = 10; // We want at least a little bit or margin.
+    const int margin = 10; // We want at least a little bit of margin.
     QRectF endArea = itemRectFromCSS(targetArea.adjusted(-margin, -margin, margin, margin));
 
@@ -371 +372 @@
     qreal targetCSSScale = cssScaleFromItem(viewportRect.size().width() / endArea.size().width());
     qreal endItemScale = itemScaleFromCSS(innerBoundedCSSScale(qMin(targetCSSScale, qreal(2.5))));
+
+    // Zoom back out on a second double click, but still center on the new touch point.
+    if (m_zoomedToArea) {
+        m_zoomedToArea = false;
+        endItemScale = 1.0;
+    } else
+        m_zoomedToArea = true;
 
     // We want to end up with the target area filling the whole width of the viewport (if possible),
@@ -526 +534 @@
 
     m_hadUserInteraction = true;
+    m_zoomedToArea = false;
 
     m_scaleUpdateDeferrer = adoptPtr(new ViewportUpdateDeferrer(this, ViewportUpdateDeferrer::DeferUpdateAndSuspendContent));

trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h

@@ -146 +146 @@
 
     bool m_hadUserInteraction;
+    bool m_zoomedToArea;
 
     class ScaleAnimation : public QVariantAnimation {