Unity 8

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

dragHandleStretchAndHint
Merge into trunk

Proposed by Daniel d'Andrada on 2013-06-27

Status:	Merged
Approved by:	Daniel d'Andrada on 2013-07-01
Approved revision:	64
Merged at revision:	66
Proposed branch:	lp:~dandrader/unity8/dragHandleStretchAndHint
Merge into:	lp:unity8
Prerequisite:	lp:~dandrader/unity8/ddaDraggingFix
Diff against target:	588 lines (+361/-75) 6 files modified Components/DragHandle.qml (+130/-63) tests/qmltests/Components/tst_DragHandle.cpp (+100/-0) tests/qmltests/Components/tst_DragHandle.qml (+32/-0) tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml (+29/-6) tests/qmltests/Components/tst_DragHandle/TestButton.qml (+41/-0) tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml (+29/-6)
To merge this branch:	bzr merge lp:~dandrader/unity8/dragHandleStretchAndHint
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-07-01
Nick Dedekind (community)		2013-07-01	Approve on 2013-07-01
Albert Astals Cid (community)		2013-06-27	Approve on 2013-07-01
Review via email: mp+171908@code.launchpad.net

Commit message

DragHandle: add stretch and hintDisplacement properties

Description of the change

DragHandle: add stretch and hintDisplacement properties

Depends on https://code.launchpad.net/~dandrader/unity8/ddaDraggingFix/+merge/171904

Needed by the upcoming change that makes Panel use DragHandles instead of a Revealer.

Try it out by typing
$ make tryDragHandle

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-28:

FAILED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/unity8-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/449
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/409

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-28:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-28:

FAILED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/unity8-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/264
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/18/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/477
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/477/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/433

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-28:

FAILED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/unity8-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/489
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/275
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/24/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/491
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/491/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/442

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2013-06-28:

Rerunning -ci as the armhf builder went-offline mid-run.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-28:

PASSED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/unity8-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/494
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/496
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/496/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/446

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-29:

FAILED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/unity8-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/498
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/500
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/500/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/450

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-29:

FAILED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/unity8-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/497
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/499
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/499/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/449

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-29:

PASSED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/unity8-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/501
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/503
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/503/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/453

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

review: Approve (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-07-01:

Looks good :-)

review: Approve

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2013-07-01:

70 + property var __previousStatus: undefined
71 + property real __startValue
72 + property real __minValue:
74 + property real __maxValue:
78 + property string __targetProp: {

Can you create a private QtObject to encapsulate these as per guidelines
https://docs.google.com/a/canonical.com/document/d/1gd87Wo_CSB0DpFWLpTKIIXQfdmFncrq0PHSr9H2PTnk/edit

72 + property real __minValue:
73 + Direction.isPositive(direction) ? __startValue : __startValue - maxTotalDragDistance
74 + property real __maxValue:
75 + Direction.isPositive(direction) ? __startValue + maxTotalDragDistance : __startValue

Expression on a new line?

368 + x = 0
369 + width = 0
370 + } else {
371 + x = -parent.width
372 + width = parent.width

456 + rect.clicked()

482 + y = 0
483 + height = 0
484 + } else {
485 + y = -parent.height
486 + height = parent.height

Semi-colons.

Top marks for the tests. All seems to work well.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-07-01:

> 70 + property var __previousStatus: undefined
> 71 + property real __startValue
> 72 + property real __minValue:
> 74 + property real __maxValue:
> 78 + property string __targetProp: {
>
> Can you create a private QtObject to encapsulate these as per guidelines
> https://docs.google.com/a/canonical.com/document/d/1gd87Wo_CSB0DpFWLpTKIIXQfdm
> Fncrq0PHSr9H2PTnk/edit

Done.

>
> 72 + property real __minValue:
> 73 + Direction.isPositive(direction) ? __startValue : __startValue
> - maxTotalDragDistance
> 74 + property real __maxValue:
> 75 + Direction.isPositive(direction) ? __startValue +
> maxTotalDragDistance : __startValue
>
> Expression on a new line?

Otherwise the line would be quite long. Done it differently now.

>
> 368 + x = 0
> 369 + width = 0
> 370 + } else {
> 371 + x = -parent.width
> 372 + width = parent.width
>
> 456 + rect.clicked()
>
> 482 + y = 0
> 483 + height = 0
> 484 + } else {
> 485 + y = -parent.height
> 486 + height = parent.height
>
> Semi-colons.

Done.

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2013-07-01:

LGTM

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-01:

FAILED: Continuous integration, rev:60
http://jenkins.qa.ubuntu.com/job/unity8-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/516
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/296
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/39/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/518
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/518/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/468

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-01:

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/521/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/8
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/8/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/523/console

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-01:

PASSED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/unity8-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/528
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/528/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/475

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

 === modified file 'Components/DragHandle.qml'
 --- Components/DragHandle.qml	2013-06-28 19:32:16 +0000
 +++ Components/DragHandle.qml	2013-07-01 16:37:36 +0000
@@ -17,6 +17,7 @@
  import QtQuick 2.0
  import Ubuntu.Components 0.1
  import Ubuntu.Gestures 0.1
++import "Math.js" as MathLocal
  /*
   Put a DragHandle inside a Showable to enable the user to drag it from that handle.
@@ -45,19 +46,122 @@
   */
  EdgeDragArea {
      id: dragArea
++    objectName: "dragHandle"
++
++    property bool stretch: false
++
++    property alias autoCompleteDragThreshold: dragEvaluator.dragThreshold
      // How far you can drag
--    property real maxTotalDragDistance: Direction.isHorizontal(direction) ? parent.width : parent.height
--
--    property var __previousStatus
--    property real __totalDragDistance: 0
++    property real maxTotalDragDistance: {
++        if (stretch) {
++            0; // not enough context information to set a sensible default
++        } else {
++            Direction.isHorizontal(direction) ? parent.width : parent.height;
++        }
++    }
++
++    property real hintDisplacement: 0
++    SmoothedAnimation {
++        id: hintingAnimation
++        target: hintingAnimation
++        property: "targetValue"
++        duration: 150
++        velocity: -1
++        to: Direction.isPositive(direction) ? d.startValue + hintDisplacement
++                                            : d.startValue - hintDisplacement
++        property real targetValue
++        onTargetValueChanged: {
++            if (!running) {
++                return;
++            }
++
++            if (Direction.isPositive(direction)) {
++                if (parent[d.targetProp] < targetValue) {
++                    parent[d.targetProp] = targetValue;
++                }
++            } else {
++                if (parent[d.targetProp] > targetValue) {
++                    parent[d.targetProp] = targetValue;
++                }
++            }
++        }
++    }
++
++    // Private stuff
++    QtObject {
++        id: d
++        property var previousStatus: undefined
++        property real startValue
++        property real minValue: Direction.isPositive(direction) ? startValue
++                                                                : startValue - maxTotalDragDistance
++        property real maxValue: Direction.isPositive(direction) ? startValue + maxTotalDragDistance
++                                                                : startValue
++
++        property var dragParent: dragArea.parent
++
++        // The property of DragHandle's parent that will be modified
++        property string targetProp: {
++            if (stretch) {
++                Direction.isHorizontal(direction) ? "width" : "height";
++            } else {
++                Direction.isHorizontal(direction) ? "x" : "y";
++            }
++        }
++
++        function limitMovement(step) {
++            var targetValue = MathLocal.clamp(dragParent[targetProp] + step, minValue, maxValue);
++            var step = targetValue - dragParent[targetProp];
++
++            if (hintDisplacement == 0) {
++                return step;
++            }
++
++            // we should not go behind hintingAnimation's current value
++            if (Direction.isPositive(direction)) {
++                if (dragParent[targetProp] + step < hintingAnimation.targetValue) {
++                    step = hintingAnimation.targetValue - dragParent[targetProp];
++                }
++            } else {
++                if (dragParent[targetProp] + step > hintingAnimation.targetValue) {
++                    step = hintingAnimation.targetValue - dragParent[targetProp];
++                }
++            }
++
++            return step;
++        }
++
++        function onFinishedRecognizedGesture() {
++            if (dragEvaluator.shouldAutoComplete()) {
++                completeDrag();
++            } else {
++                rollbackDrag();
++            }
++        }
++
++        function completeDrag() {
++            if (dragParent.shown) {
++                dragParent.hide();
++            } else {
++                dragParent.show();
++            }
++        }
++
++        function rollbackDrag() {
++            if (dragParent.shown) {
++                dragParent.show();
++            } else {
++                dragParent.hide();
++            }
++        }
++    }
      property alias edgeDragEvaluator: dragEvaluator
      EdgeDragEvaluator {
          objectName: "edgeDragEvaluator"
          id: dragEvaluator
--        trackedPosition: Direction.isHorizontal(direction) ? parent.x + touchX : parent.y + touchY
++        trackedPosition: sceneDistance
          maxDragDistance: maxTotalDragDistance
          direction: dragArea.direction
+     }
@@ -67,75 +171,38 @@
              // don't go the whole distance in order to smooth out the movement
              var step = distance * 0.3;
--            step = __limitMovement(step);
--
--            __totalDragDistance += step;
--
--            if (Direction.isHorizontal(direction)) {
--                parent.x += step;
--            } else {
--                parent.y += step;
--            }
++            step = d.limitMovement(step);
++
++            parent[d.targetProp] += step;
+         }
+     }
--
--    function __limitMovement(step) {
--        if (Direction.isPositive(direction)) {
--            if (__totalDragDistance + step > maxTotalDragDistance) {
--                step = maxTotalDragDistance - __totalDragDistance;
--            } else if (__totalDragDistance + step < 0) {
--                step = 0 - __totalDragDistance;
++    onDraggingChanged: {
++        if (dragging) {
++            if (hintDisplacement > 0) {
++                hintingAnimation.targetValue = d.startValue;
++                hintingAnimation.start();
+             }
          } else {
--            if (__totalDragDistance + step < -maxTotalDragDistance) {
--                step = -maxTotalDragDistance - __totalDragDistance;
--            } else if (__totalDragDistance + step > 0) {
--                step = 0 - __totalDragDistance;
--            }
++            hintingAnimation.stop();
+         }
--
--        return step;
+     }
      onStatusChanged: {
          if (status === DirectionalDragArea.WaitingForTouch) {
--            if (__previousStatus === DirectionalDragArea.Recognized) {
--                __onFinishedRecognizedGesture();
++            if (d.previousStatus === DirectionalDragArea.Recognized) {
++                d.onFinishedRecognizedGesture();
+             }
--            __totalDragDistance = 0;
++            d.startValue = parent[d.targetProp];
+         }
--        else if (status === DirectionalDragArea.Undecided) {
++
++        if (d.previousStatus === DirectionalDragArea.WaitingForTouch ||
++                d.previousStatus === undefined) {
              dragEvaluator.reset();
--        }
--        else if (status === DirectionalDragArea.Recognized) {
--            if (__previousStatus === DirectionalDragArea.WaitingForTouch)
--                dragEvaluator.reset();
--        }
--        __previousStatus = status;
--    }
--
--    function __onFinishedRecognizedGesture() {
--        if (dragEvaluator.shouldAutoComplete()) {
--            __completeDrag();
--        } else {
--            __rollbackDrag();
--        }
--    }
--
--    function __completeDrag() {
--        if (parent.shown) {
--            parent.hide();
--        } else {
--            parent.show();
--        }
--    }
--
--    function __rollbackDrag() {
--        if (parent.shown) {
--            parent.show();
--        } else {
--            parent.hide();
--        }
--    }
++            d.startValue = parent[d.targetProp];
++        }
++
++        d.previousStatus = status;
++    }
++
+ }
 === modified file 'tests/qmltests/Components/tst_DragHandle.cpp'
 --- tests/qmltests/Components/tst_DragHandle.cpp	2013-06-27 13:16:53 +0000
 +++ tests/qmltests/Components/tst_DragHandle.cpp	2013-07-01 16:37:36 +0000
@@ -59,6 +59,9 @@
      void dragThreshold_horizontal();
      void dragThreshold_vertical();
++    void stretch_horizontal();
++    void stretch_vertical();
++    void hintingAnimation();
  private:
      void flickAndHold(DirectionalDragArea *dragHandle, qreal distance);
@@ -290,6 +293,103 @@
      QCOMPARE(parentItem->property("shown").toBool(), false);
+ }
++/*
++  Checks that when the stretch property is true, dragging the DragHandle increases
++  the width or height (depending on its direction) of its parent Showable
++ */
++void tst_DragHandle::stretch_horizontal()
++{
++    DirectionalDragArea *dragHandle = fetchAndSetupDragHandle("rightwardsDragHandle");
++    qreal totalDragDistance = dragHandle->property("maxTotalDragDistance").toReal();
++    QQuickItem *parentItem = dragHandle->parentItem();
++
++    // enable strech mode
++    m_view->rootObject()->setProperty("stretch", QVariant(true));
++
++    QCOMPARE(parentItem->width(), 0.0);
++
++    // flick all the way
++    flickAndHold(dragHandle, totalDragDistance);
++
++    // should keep going until completion
++    // Parent item should now have its full height
++    tryCompare([&](){ return parentItem->width(); }, totalDragDistance);
++    QCOMPARE(parentItem->property("shown").toBool(), true);
++
++    dragHandle = fetchAndSetupDragHandle("leftwardsDragHandle");
++
++    // flick all the way
++    flickAndHold(dragHandle, totalDragDistance);
++
++    // should keep going until completion
++    // Parent item should now have its full height
++    tryCompare([&](){ return parentItem->width(); }, 0.0);
++    QCOMPARE(parentItem->property("shown").toBool(), false);
++}
++
++void tst_DragHandle::stretch_vertical()
++{
++    DirectionalDragArea *dragHandle = fetchAndSetupDragHandle("downwardsDragHandle");
++    qreal totalDragDistance = dragHandle->property("maxTotalDragDistance").toReal();
++    QQuickItem *parentItem = dragHandle->parentItem();
++
++    // enable strech mode
++    m_view->rootObject()->setProperty("stretch", QVariant(true));
++
++    QCOMPARE(parentItem->height(), 0.0);
++
++    // flick all the way
++    flickAndHold(dragHandle, totalDragDistance);
++
++    // should keep going until completion
++    // Parent item should now have its full height
++    tryCompare([&](){ return parentItem->height(); }, totalDragDistance);
++    QCOMPARE(parentItem->property("shown").toBool(), true);
++
++    dragHandle = fetchAndSetupDragHandle("upwardsDragHandle");
++
++    // flick all the way
++    flickAndHold(dragHandle, totalDragDistance);
++
++    // should keep going until completion
++    // Parent item should now have its full height
++    tryCompare([&](){ return parentItem->height(); }, 0.0);
++    QCOMPARE(parentItem->property("shown").toBool(), false);
++}
++
++/*
++    Set DragHandle.hintDisplacement to a value bigger than zero.
++    Then lay a finger on the DragHandle.
++    The expected behavior is that it will move or strech its parent Showable
++    by hintDisplacement pixels.
++ */
++void tst_DragHandle::hintingAnimation()
++{
++    DirectionalDragArea *dragHandle = fetchAndSetupDragHandle("downwardsDragHandle");
++    QQuickItem *parentItem = dragHandle->parentItem();
++    qreal hintDisplacement = 100.0;
++
++    // enable hinting animations and stretch mode
++    m_view->rootObject()->setProperty("hintDisplacement", QVariant(hintDisplacement));
++    m_view->rootObject()->setProperty("stretch", QVariant(true));
++
++    QCOMPARE(parentItem->height(), 0.0);
++
++    QPointF initialTouchPos = dragHandle->mapToScene(
++        QPointF(dragHandle->width() / 2.0, dragHandle->height() / 2.0));
++    QPointF touchPoint = initialTouchPos;
++
++    // Pressing causes the Showable to be stretched by hintDisplacement pixels
++    QTest::touchEvent(m_view, m_device).press(0, touchPoint.toPoint());
++    tryCompare([&](){ return parentItem->height(); }, hintDisplacement);
++
++    // Releasing causes the Showable to shrink back to 0 pixels.
++    QTest::touchEvent(m_view, m_device).release(0, touchPoint.toPoint());
++    tryCompare([&](){ return parentItem->height(); }, 0.0);
++
++    QCOMPARE(parentItem->property("shown").toBool(), false);
++}
++
  QTEST_MAIN(tst_DragHandle)
  #include "tst_DragHandle.moc"
 === modified file 'tests/qmltests/Components/tst_DragHandle.qml'
 --- tests/qmltests/Components/tst_DragHandle.qml	2013-06-27 13:16:53 +0000
 +++ tests/qmltests/Components/tst_DragHandle.qml	2013-07-01 16:37:36 +0000
@@ -34,12 +34,19 @@
      property var dragHandle
++    property bool stretch: false
++    property real hintDisplacement: 0
++
      VerticalShowable {
          onDragHandleRecognizedGesture: { root.dragHandle = dragHandle }
++        stretch: root.stretch
++        hintDisplacement: root.hintDisplacement
+     }
      HorizontalShowable {
          onDragHandleRecognizedGesture: { root.dragHandle = dragHandle }
++        stretch: root.stretch
++        hintDisplacement: root.hintDisplacement
+     }
      // Visually mark drag threshold
@@ -111,4 +118,29 @@
+             }
+         }
+     }
++
++    TestButton {
++        id: stretchButton
++        anchors.bottom: parent.bottom
++        anchors.left: parent.left
++        anchors.margins: units.gu(1)
++
++        text: root.stretch ? "stretch" : "move"
++        onClicked: { root.stretch = !root.stretch; }
++    }
++
++    TestButton {
++        anchors.bottom: parent.bottom
++        anchors.left: stretchButton.right
++        anchors.margins: units.gu(1)
++
++        text: root.hintDisplacement > 0 ? "hint" : "no hint"
++        onClicked: {
++            if (root.hintDisplacement > 0) {
++                root.hintDisplacement = 0;
++            } else {
++                root.hintDisplacement = units.gu(6);
++            }
++        }
++    }
+ }
 === modified file 'tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml'
 --- tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml	2013-06-27 13:16:53 +0000
 +++ tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml	2013-07-01 16:37:36 +0000
@@ -21,18 +21,35 @@
  Showable {
      id: showable
--    x: -width
--    width: parent.width
++    x: stretch ? 0 : -width
++    width: stretch ? 0 : parent.width
      height: parent.height
++    property bool stretch
++    property real hintDisplacement
++
++    onStretchChanged: {
++        if (stretch) {
++            x = 0;
++            width = 0;
++        } else {
++            x = -parent.width;
++            width = parent.width;
++        }
++    }
++
      shown: false
      signal dragHandleRecognizedGesture(var dragHandle)
--    showAnimation: StandardAnimation { property: "x"; to: 0 }
--    hideAnimation: StandardAnimation { property: "x"; to: -width }
--
--    Rectangle { color: "blue"; anchors.fill: parent }
++    property string animatedProp: stretch ? "width" : "x"
++    property real propValueWhenShown: stretch ? parent.width : 0
++    property real propValueWhenHidden: stretch ? 0 : -width
++
++    showAnimation: StandardAnimation { property: animatedProp; to: propValueWhenShown }
++    hideAnimation: StandardAnimation { property: animatedProp; to: propValueWhenHidden }
++
++    Image { source: "UnityLogo.png"; anchors.fill: parent }
      DragHandle {
          objectName: "leftwardsDragHandle"
@@ -44,6 +61,9 @@
          width: units.gu(2)
          direction: Direction.Leftwards
++        stretch: showable.stretch
++        maxTotalDragDistance: showable.parent.width
++        hintDisplacement: showable.hintDisplacement
          onStatusChanged: {
              if (status === DirectionalDragArea.Recognized) {
@@ -64,6 +84,9 @@
          width: units.gu(2)
          direction: Direction.Rightwards
++        stretch: showable.stretch
++        maxTotalDragDistance: showable.parent.width
++        hintDisplacement: showable.hintDisplacement
          onStatusChanged: {
              if (status === DirectionalDragArea.Recognized) {
 === added file 'tests/qmltests/Components/tst_DragHandle/TestButton.qml'
 --- tests/qmltests/Components/tst_DragHandle/TestButton.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Components/tst_DragHandle/TestButton.qml	2013-07-01 16:37:36 +0000
@@ -0,0 +1,41 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++
++Rectangle {
++    id: rect
++    width: childrenRect.width
++    height: childrenRect.height
++
++    property alias text: textComponent.text
++
++    signal clicked
++
++    color: "yellow"
++    Text {
++        id: textComponent
++        font.pixelSize: units.gu(2)
++        text: root.stretch ? "stretch" : "move"
++        MouseArea {
++            anchors.fill: parent
++            onClicked: {
++                rect.clicked()
++            }
++        }
++    }
++}
 === added file 'tests/qmltests/Components/tst_DragHandle/UnityLogo.png'
 Binary files tests/qmltests/Components/tst_DragHandle/UnityLogo.png	1970-01-01 00:00:00 +0000 and tests/qmltests/Components/tst_DragHandle/UnityLogo.png	2013-07-01 16:37:36 +0000 differ
 === modified file 'tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml'
 --- tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml	2013-06-27 13:16:53 +0000
 +++ tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml	2013-07-01 16:37:36 +0000
@@ -21,18 +21,35 @@
  Showable {
      id: showable
--    y: -height
++    y: stretch ? 0 : -height
      width: parent.width
--    height: parent.height
++    height: stretch ? 0 : parent.height
++
++    property bool stretch
++    property real hintDisplacement
++
++    onStretchChanged: {
++        if (stretch) {
++            y = 0;
++            height = 0;
++        } else {
++            y = -parent.height;
++            height = parent.height;
++        }
++    }
      shown: false
      signal dragHandleRecognizedGesture(var dragHandle)
--    showAnimation: StandardAnimation { property: "y"; to: 0 }
--    hideAnimation: StandardAnimation { property: "y"; to: -height }
--
--    Rectangle { color: "blue"; anchors.fill: parent }
++    property string animatedProp: stretch ? "height" : "y"
++    property real propValueWhenShown: stretch ? parent.height : 0
++    property real propValueWhenHidden: stretch ? 0 : -height
++
++    showAnimation: StandardAnimation { property: animatedProp; to: propValueWhenShown }
++    hideAnimation: StandardAnimation { property: animatedProp; to: propValueWhenHidden }
++
++    Image { source: "UnityLogo.png"; anchors.fill: parent }
      DragHandle {
          objectName: "upwardsDragHandle"
@@ -44,6 +61,9 @@
          height: units.gu(2)
          direction: Direction.Upwards
++        stretch: showable.stretch
++        maxTotalDragDistance: showable.parent.height
++        hintDisplacement: showable.hintDisplacement
          onStatusChanged: {
              if (status === DirectionalDragArea.Recognized) {
@@ -64,6 +84,9 @@
          height: units.gu(2)
          direction: Direction.Downwards
++        stretch: showable.stretch
++        maxTotalDragDistance: showable.parent.height
++        hintDisplacement: showable.hintDisplacement
          onStatusChanged: {
              if (status === DirectionalDragArea.Recognized) {