Title: [106116] trunk/Source/WebKit2
Revision
106116
Author
kenn...@webkit.org
Date
2012-01-27 06:20:50 -0800 (Fri, 27 Jan 2012)

Log Message

[Qt] Fade out tap highlighting when starting to pan
https://bugs.webkit.org/show_bug.cgi?id=77202

Reviewed by Simon Hausmann.

Basically we need to fade out the potential tap highlighting
when ever the gesture recognition fails or another gesture
is recognized. We do that with this change.

* UIProcess/qt/QtTapGestureRecognizer.cpp:
(WebKit::QtTapGestureRecognizer::QtTapGestureRecognizer):
(WebKit::QtTapGestureRecognizer::recognize):
(WebKit::QtTapGestureRecognizer::reset):

    Remove reset as it does nothing but call code before the
    event handler is installed.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (106115 => 106116)


--- trunk/Source/WebKit2/ChangeLog	2012-01-27 14:08:49 UTC (rev 106115)
+++ trunk/Source/WebKit2/ChangeLog	2012-01-27 14:20:50 UTC (rev 106116)
@@ -1,3 +1,22 @@
+2012-01-27  Kenneth Rohde Christiansen  <kenn...@webkit.org>
+
+        [Qt] Fade out tap highlighting when starting to pan
+        https://bugs.webkit.org/show_bug.cgi?id=77202
+
+        Reviewed by Simon Hausmann.
+
+        Basically we need to fade out the potential tap highlighting
+        when ever the gesture recognition fails or another gesture
+        is recognized. We do that with this change.
+
+        * UIProcess/qt/QtTapGestureRecognizer.cpp:
+        (WebKit::QtTapGestureRecognizer::QtTapGestureRecognizer):
+        (WebKit::QtTapGestureRecognizer::recognize):
+        (WebKit::QtTapGestureRecognizer::reset):
+
+            Remove reset as it does nothing but call code before the
+            event handler is installed.
+
 2012-01-26  No'am Rosenthal  <noam.rosent...@nokia.com> and Jocelyn Turcotte  <jocelyn.turco...@nokia.com>
 
         [Qt] WKTR: Use a software rendering pipiline when running tests.

Modified: trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp (106115 => 106116)


--- trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp	2012-01-27 14:08:49 UTC (rev 106115)
+++ trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp	2012-01-27 14:20:50 UTC (rev 106116)
@@ -35,7 +35,6 @@
     : QtGestureRecognizer(eventHandler)
     , m_tapState(NoTap)
 {
-    reset();
 }
 
 bool QtTapGestureRecognizer::recognize(const QTouchEvent* event, qint64 eventTimestampMillis)
@@ -87,6 +86,7 @@
         break;
     case QEvent::TouchEnd:
         m_tapAndHoldTimer.stop();
+        m_eventHandler->handlePotentialSingleTapEvent(QTouchEvent::TouchPoint());
 
         switch (m_tapState) {
         case DoubleTapCandidate:
@@ -117,9 +117,6 @@
         break;
     }
 
-    if (m_tapState == NoTap)
-        m_eventHandler->handlePotentialSingleTapEvent(QTouchEvent::TouchPoint());
-
     return false;
 }
 
@@ -149,6 +146,8 @@
 
 void QtTapGestureRecognizer::reset()
 {
+    m_eventHandler->handlePotentialSingleTapEvent(QTouchEvent::TouchPoint());
+
     m_tapState = NoTap;
     m_touchBeginEventForTap.clear();
     m_tapAndHoldTimer.stop();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to