Merge lp:~dandrader/unity8/ddaDraggingFix into lp:unity8

[Daniel d'Andrada]

DirectionalDragArea: emit draggingChanged() on direct recognition

draggingChanged() should be emited when status change from
WaitingForTouch directly to Recognized.

DirectionalDragArea: emit draggingChanged() on direct recognition (i.e. when gesture recognition is actually disable so anything goes through).

draggingChanged() should be emited when status change from
WaitingForTouch directly to Recognized.

Needed by upcoming patches.

Depends on https://code.launchpad.net/~dandrader/unity8/ddaScenePos/+merge/171902

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/unity8-ci/6/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/443
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/443/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/403

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/6/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/unity8-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/448
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/408

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/11/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

This proposal is only about revision 55.

Revision 54 comes from https://code.launchpad.net/~dandrader/unity8/ddaScenePos/+merge/171902

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.cpp'
--- plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2013-06-27 20:00:09 +0000
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2013-06-28 16:24:25 +0000
@@ -391,6 +391,10 @@
             m_recognitionTimer->start();
             Q_EMIT draggingChanged(true);
             break;
+        case Recognized:
+            if (oldStatus == WaitingForTouch)
+                Q_EMIT draggingChanged(true);
+            break;
         case Rejected:
             Q_EMIT draggingChanged(false);
             break;

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2013-06-27 20:00:09 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2013-06-28 16:24:25 +0000
@@ -67,6 +67,7 @@
     void maxSilenceTime();
     void sceneXAndX();
     void sceneYAndY();
+    void emitDraggingChangedOnDirectRecognition();
 
 private:
     QQuickView *createView();
@@ -514,6 +515,37 @@
     QCOMPARE(edgeDragArea->touchSceneY(), touchScenePos.y());
 }
 
+/*
+  Emit draggingChanged() when status change from WaitingForTouch directly to Recognized.
+  This happens when the gesture recognition is effectively disabled (e.g. by setting a
+  distanceThreshold of zero)
+ */
+void tst_DirectionalDragArea::emitDraggingChangedOnDirectRecognition()
+{
+    DirectionalDragArea *edgeDragArea =
+        view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
+    QVERIFY(edgeDragArea != 0);
+    edgeDragArea->setRecognitionTimer(fakeTimer);
+    edgeDragArea->setTimeSource(fakeTimeSource);
+
+    QPointF touchPos = calculateInitialTouchPos(edgeDragArea, view);
+
+    QSignalSpy draggingSpy(edgeDragArea, SIGNAL(draggingChanged(bool)));
+
+    // That will make it completetly skip the recognition phase ("Undecided" status).
+    edgeDragArea->setDistanceThreshold(0.0);
+
+    QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::WaitingForTouch);
+    QCOMPARE(edgeDragArea->dragging(), false);
+
+    fakeTimeSource->m_msecsSinceReference = 0;
+    QTest::touchEvent(view, device).press(0, touchPos.toPoint());
+
+    QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::Recognized);
+    QCOMPARE(draggingSpy.count(), 1);
+    QCOMPARE(edgeDragArea->dragging(), true);
+}
+
 QTEST_MAIN(tst_DirectionalDragArea)
 
 #include "tst_DirectionalDragArea.moc"