Merge lp:~fboucault/ubuntu-ui-toolkit/list_item_swipe_position into lp:ubuntu-ui-toolkit/staging

[Florian Boucault]

Added new property to ListItem: real swipePosition

Added new property to ListItem: real swipePosition

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2144
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1541/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7082/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1541/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2144
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1298/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7088/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1298/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2144
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1332/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7089/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1332/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2144
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/112/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7090/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/112/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2144
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1548/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7091/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1548/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2144
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/827/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1541/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1548
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1332
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1298
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/112
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7092/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7082
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7091
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7089
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7088
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7090

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/827/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Looks good, krillin is again OoO :/ Hopefully autolanding will get it.

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2144
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1542/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7093/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1542/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2144
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1299/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7094/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1299/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2144
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1333/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7095/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1333/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2144
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1549/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7096/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1549/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2144
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/113/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7097/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/113/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/577/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1542/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1549
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1333
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1299
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/113
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/876/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7093
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7096
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7095
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7094
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7097

review: Needs Fixing (continuous-integration)

Unmerged revisions

2144. By Florian Boucault on 2016-10-14

Fix some unit tests

2143. By Florian Boucault on 2016-10-14

Added basic unit tests for ListItem.swipePosition

2142. By Florian Boucault on 2016-10-14

Added more unit tests for ListItem.swipePosition

2141. By Florian Boucault on 2016-10-13

Added new property to API

2140. By Florian Boucault on 2016-10-11

Preliminary implementation of ListItem::swipePosition

=== modified file 'components.api'
--- components.api	2016-09-17 05:48:25 +0000
+++ components.api	2016-10-14 12:12:03 +0000
@@ -612,6 +612,7 @@
     property bool selectMode
     property bool selected
     property bool swipeEnabled 1.3
+    property double swipePosition 1.3
     readonly property bool swiped 1.3
     property ListItemActions trailingActions
 Ubuntu.Components.ListItemActions 1.2 UCListItemActions: QtObject

=== modified file 'src/UbuntuToolkit/uclistitem.cpp'
--- src/UbuntuToolkit/uclistitem.cpp	2016-09-20 06:24:44 +0000
+++ src/UbuntuToolkit/uclistitem.cpp	2016-10-14 12:12:03 +0000
@@ -509,6 +509,8 @@
     if (event.m_contentPos != contentItem->position()) {
         contentItem->setPosition(event.m_contentPos);
         lastPos = localPos;
+        Q_Q(UCListItem);
+        q->swipePositionChanged();
         if (status == UCSwipeEvent::Updated) {
             setContentMoving(true);
             setSwiped(true);
@@ -2009,6 +2011,58 @@
 }
 
 /*!
+ * \qmlproperty bool ListItem::swipePosition
+ * \since Ubuntu.Components 1.3
+ * The property controls the swiping of the leading- or trailing actions. This
+ * is useful when swiping needs to be triggered programatically, for example
+ * when demonstrating that actions are present and can be swiped.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * ListItem {
+ *     id: listItem
+ *
+ *     leadingActions: ListItemActions {
+ *         actions: [
+ *             Action {
+ *                 iconName: "delete"
+ *             }
+ *         ]
+ *     }
+ *
+ *     UbuntuNumberAnimation {
+ *         target: listItem
+ *         property: "swipePosition"
+ *         to: units.gu(8)
+ *     }
+ * }
+ * \endqml
+ */
+qreal UCListItem::swipePosition() const
+{
+    Q_D(const UCListItem);
+    return d->contentItem->position().x();
+}
+void UCListItem::setSwipePosition(qreal swipePosition)
+{
+    Q_D(UCListItem);
+    if (!d->leadingActions || !d->trailingActions) {
+        return;
+    }
+    if (d->contentItem->position().x() == swipePosition) {
+        return;
+    }
+
+    d->setSwiped(true);
+    d->lockContentItem(false);
+    d->loadStyleItem();
+    d->lastPos = QPointF(0.0, 0.0);
+    QPointF localPos(swipePosition, 0.0);
+    d->swipeEvent(localPos, UCSwipeEvent::Updated);
+}
+
+/*!
  * \qmlproperty bool ListItem::swiped
  * \readonly
  * \since Ubuntu.Components 1.3

=== modified file 'src/UbuntuToolkit/uclistitem_p.h'
--- src/UbuntuToolkit/uclistitem_p.h	2016-09-16 05:01:13 +0000
+++ src/UbuntuToolkit/uclistitem_p.h	2016-10-14 12:12:03 +0000
@@ -66,6 +66,7 @@
 #endif
     Q_PROPERTY(bool swipeEnabled READ isSwipeEnabled WRITE setSwipeEnabled NOTIFY swipeEnabledChanged FINAL REVISION 1)
     Q_PROPERTY(bool swiped READ isSwiped NOTIFY swipedChanged FINAL REVISION 1)
+    Q_PROPERTY(qreal swipePosition READ swipePosition WRITE setSwipePosition NOTIFY swipePositionChanged FINAL REVISION 1)
 public:
     explicit UCListItem(QQuickItem *parent = 0);
     ~UCListItem();
@@ -89,6 +90,8 @@
     UCListItemExpansion *expansion();
     bool isSwipeEnabled() const;
     void setSwipeEnabled(bool swipeEnabled);
+    qreal swipePosition() const;
+    void setSwipePosition(qreal swipePosition);
     bool isSwiped();
 
 protected:
@@ -123,6 +126,7 @@
     void listItemChildrenChanged();
     Q_REVISION(1) void swipeEnabledChanged();
     Q_REVISION(1) void swipedChanged();
+    Q_REVISION(1) void swipePositionChanged();
 
     void clicked();
     void pressAndHold();

=== modified file 'tests/unit/visual/tst_listitem.13.qml'
--- tests/unit/visual/tst_listitem.13.qml	2016-10-06 11:22:26 +0000
+++ tests/unit/visual/tst_listitem.13.qml	2016-10-14 12:12:03 +0000
@@ -263,6 +263,7 @@
             compare(defaults.__styleInstance, null, "__styleInstance must be null.");
             compare(defaults.selected, false, "Not selected by default");
             compare(defaults.selectMode, false, "Not selectable by default");
+            compare(defaults.swipePosition, 0, "swipePosition must be 0 by default");
             compare(testColumn.ViewItems.selectMode, false, "The parent attached property is not selectable by default");
             compare(testColumn.ViewItems.selectedIndices.length, 0, "No item is selected by default");
             compare(listView.ViewItems.dragMode, false, "Drag mode is off on ListView");
@@ -423,16 +424,20 @@
         function test_tug_actions_data() {
             var item = findChild(listView, "listItem0");
             return [
-                {tag: "Trailing, mouse", item: item, pos: centerOf(item), dx: -units.gu(20), positiveDirection: false, mouse: true},
-                {tag: "Leading, mouse", item: item, pos: centerOf(item), dx: units.gu(20), positiveDirection: true, mouse: true},
-                {tag: "Trailing, touch", item: item, pos: centerOf(item), dx: -units.gu(20), positiveDirection: false, mouse: false},
-                {tag: "Leading, touch", item: item, pos: centerOf(item), dx: units.gu(20), positiveDirection: true, mouse: false},
+                {tag: "Trailing, mouse", item: item, pos: centerOf(item), dx: -units.gu(20), positiveDirection: false, mouse: true, swipePosition: false},
+                {tag: "Leading, mouse", item: item, pos: centerOf(item), dx: units.gu(20), positiveDirection: true, mouse: true, swipePosition: false},
+                {tag: "Trailing, touch", item: item, pos: centerOf(item), dx: -units.gu(20), positiveDirection: false, mouse: false, swipePosition: false},
+                {tag: "Leading, touch", item: item, pos: centerOf(item), dx: units.gu(20), positiveDirection: true, mouse: false, swipePosition: false},
+                {tag: "Trailing, swipePosition", item: item, pos: centerOf(item), dx: -units.gu(20), positiveDirection: false, mouse: false, swipePosition: true},
+                {tag: "Leading, swipePosition", item: item, pos: centerOf(item), dx: units.gu(20), positiveDirection: true, mouse: false, swipePosition: true},
             ];
         }
         function test_tug_actions(data) {
             listView.positionViewAtBeginning();
             if (data.mouse) {
                 swipe(data.item, data.pos.x, data.pos.y, data.dx, 0);
+            } else if (data.swipePosition) {
+                data.item.swipePosition = data.dx;
             } else {
                 tug(data.item, data.pos.x, data.pos.y, data.dx, 0);
             }
@@ -458,16 +463,20 @@
             var item0 = findChild(listView, "listItem0");
             var item1 = findChild(listView, "listItem1");
             return [
-                {tag: "Click on an other Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item1, mouse: true},
-                {tag: "Click on the same Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item0, mouse: true},
-                {tag: "Tap on an other Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item1, mouse: false},
-                {tag: "Tap on the same Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item0, mouse: false},
+                {tag: "Click on an other Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item1, mouse: true, swipePosition: false},
+                {tag: "Click on the same Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item0, mouse: true, swipePosition: false},
+                {tag: "Tap on an other Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item1, mouse: false, swipePosition: false},
+                {tag: "Tap on the same Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item0, mouse: false, swipePosition: false},
+                {tag: "Set swipePosition then click on an other Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item1, mouse: false, swipePosition: true},
+                {tag: "Set swipePosition then click on the same Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item0, mouse: false, swipePosition: true},
             ];
         }
         function test_rebound_when_pressed_outside_or_clicked(data) {
             listView.positionViewAtBeginning();
             if (data.mouse) {
                 swipe(data.item, data.pos.x, data.pos.y, data.dx, 0);
+            } else if (data.swipePosition) {
+                data.item.swipePosition = data.dx;
             } else {
                 tug(data.item, data.pos.x, data.pos.y, data.dx, 0);
             }
@@ -484,6 +493,8 @@
                 {tag: "Leading", item: item0, pos: centerOf(item0), dx: units.gu(20), clickOn: item0.contentItem, mouse: true},
                 {tag: "Trailing", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item1, mouse: false},
                 {tag: "Leading", item: item0, pos: centerOf(item0), dx: units.gu(20), clickOn: item0.contentItem, mouse: false},
+                {tag: "Trailing, swipePosition", item: item0, pos: centerOf(item0), dx: -units.gu(10), clickOn: item1, mouse: false, swipePosition: true},
+                {tag: "Leading, swipePosition", item: item0, pos: centerOf(item0), dx: units.gu(10), clickOn: item0.contentItem, mouse: false, swipePosition: true},
             ];
         }
         function test_listview_not_interactive_while_tugged(data) {
@@ -492,6 +503,8 @@
             compare(listView.interactive, true, "ListView is not interactive");
             if (data.mouse) {
                 swipe(data.item, data.pos.x, data.pos.y, data.dx, units.gu(5));
+            } else if (data.swipePosition) {
+                data.item.swipePosition = data.dx;
             } else {
                 tug(data.item, data.pos.x, data.pos.y, data.dx, units.gu(5));
             }

=== modified file 'tests/unit/visual/tst_listitem_extras.13.qml'
--- tests/unit/visual/tst_listitem_extras.13.qml	2016-06-15 13:46:51 +0000
+++ tests/unit/visual/tst_listitem_extras.13.qml	2016-10-14 12:12:03 +0000
@@ -215,17 +215,25 @@
 
         function test_button_inactive_while_swiped_data() {
             return [
-                {tag: "mouse", touch: false, dx: units.gu(20)},
-                {tag: "touch", touch: true, dx: units.gu(20)},
+                {tag: "mouse", touch: false, swipePosition: false, dx: units.gu(20)},
+                {tag: "touch", touch: true, swipePosition: false, dx: units.gu(20)},
+                {tag: "swipePosition", touch: false, swipePosition: true, dx: units.gu(20)},
+                {tag: "swipePosition", touch: true, swipePosition: true, dx: units.gu(20)},
             ];
         }
         function test_button_inactive_while_swiped(data) {
             clickSpy.target = activeItem;
+            if (data.swipePosition) {
+                testWithActiveItem.swipePosition = data.dx;
+            } else if (data.touch) {
+                tug(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.dx, 0);
+            } else {
+                swipe(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.dx, 0);
+            }
+
             if (data.touch) {
-                tug(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.dx, 0);
                 TestExtras.touchClick(0, activeItem, centerOf(activeItem));
             } else {
-                swipe(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.dx, 0);
                 mouseClick(activeItem, centerOf(activeItem).x, centerOf(activeItem).y);
             }
             expectFail(data.tag, "Button is inactive while swiped");
@@ -271,16 +279,20 @@
 
         function test_swipe_on_empty_actions_bug1500416_data() {
             return [
-                {tag: "swipe leading, touch", item: emptyActionList, dx: units.gu(5), touch: true},
-                {tag: "swipe trailing, touch", item: emptyActionList, dx: -units.gu(5), touch: true},
-                {tag: "swipe leading, mouse", item: emptyActionList, dx: units.gu(5), touch: false},
-                {tag: "swipe trailing, mouse", item: emptyActionList, dx: -units.gu(5), touch: false}
+                {tag: "swipe leading, touch", item: emptyActionList, dx: units.gu(5), touch: true, swipePosition: false},
+                {tag: "swipe trailing, touch", item: emptyActionList, dx: -units.gu(5), touch: true, swipePosition: false},
+                {tag: "swipe leading, mouse", item: emptyActionList, dx: units.gu(5), touch: false, swipePosition: false},
+                {tag: "swipe trailing, mouse", item: emptyActionList, dx: -units.gu(5), touch: false, swipePosition: false},
+                {tag: "swipe leading, swipePosition", item: emptyActionList, dx: units.gu(5), touch: false, swipePosition: true},
+                {tag: "swipe trailing, swipePosition", item: emptyActionList, dx: -units.gu(5), touch: false, swipePosition: true}
             ];
         }
         function test_swipe_on_empty_actions_bug1500416(data) {
             setupSpy(data.item, "contentMovementEnded");
             if (data.touch) {
                 tugNoWait(data.item, centerOf(data.item).x, centerOf(data.item).y, data.dx, 0);
+            } else if (data.swipePosition) {
+                data.item.swipePosition = data.dx;
             } else {
                 swipeNoWait(data.item, centerOf(data.item).x, centerOf(data.item).y, data.dx, 0);
             }
@@ -291,10 +303,12 @@
         function test_swipe_not_possible_when_swipe_disabled_data() {
             listView.positionViewAtBeginning();
             return [
-                {tag: "leading, touch", item: findChild(listView, "listItem0"), dx: units.gu(10), touch: true},
-                {tag: "trailing, touch", item: findChild(listView, "listItem0"), dx: -units.gu(10), touch: true},
-                {tag: "leading, mouse", item: findChild(listView, "listItem0"), dx: units.gu(10), touch: false},
-                {tag: "trailing, mouse", item: findChild(listView, "listItem0"), dx: -units.gu(10), touch: false},
+                {tag: "leading, touch", item: findChild(listView, "listItem0"), dx: units.gu(10), touch: true, swipePosition: false},
+                {tag: "trailing, touch", item: findChild(listView, "listItem0"), dx: -units.gu(10), touch: true, swipePosition: false},
+                {tag: "leading, mouse", item: findChild(listView, "listItem0"), dx: units.gu(10), touch: false, swipePosition: false},
+                {tag: "trailing, mouse", item: findChild(listView, "listItem0"), dx: -units.gu(10), touch: false, swipePosition: false},
+                {tag: "leading, swipePosition", item: findChild(listView, "listItem0"), dx: units.gu(10), touch: false, swipePosition: true},
+                {tag: "trailing, swipePosition", item: findChild(listView, "listItem0"), dx: -units.gu(10), touch: false, swipePosition: true},
             ];
         }
         function test_swipe_not_possible_when_swipe_disabled(data) {
@@ -303,6 +317,8 @@
             setupSpy(data.item, "contentMovementEnded");
             if (data.touch) {
                 tugNoWait(data.item, centerOf(data.item).x, centerOf(data.item).y, data.dx, 0);
+            } else if (data.swipePosition) {
+                data.item.swipePosition = data.dx;
             } else {
                 swipeNoWait(data.item, centerOf(data.item).x, centerOf(data.item).y, data.dx, 0);
             }