Merge lp:~zsombi/ubuntu-ui-toolkit/79b-styling-reshufled into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Transferring the ListItem attached properties to ListItemStyle API. Most of the style API became redundant, and removed. Few API from ListItem were also removed as not needed. ListItemAnimator, UCListItemAttached and UCActionPanel classes removed.
Panel swiping overshoot made elastic. Snapping animation transformed into SmoothedAnimation, uses velocity of 60GU/second.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1414
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1431/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/161
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/161/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/158
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1310
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1310/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17983

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1431/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

427 + Object {

as this Object has no children, you can use a QtObject instead.

[Tim Peeters (tpeeters)]

1008 + if (swiped == isSwiped) {
1009 return;
1010 }
1011 - this->swiped = swiped;
1012 + swiped = isSwiped;

Actually I like the style you had here before, using "this->" because that makes it immediately clear that this is an instance variable.

[Tim Peeters (tpeeters)]

When I run the gallery, I get errors:

tim@ubuntu:~/dev/ubuntu-ui-toolkit/r/79b-styling-reshufled$ ./gallery.sh
file:///home/tim/dev/ubuntu-ui-toolkit/r/79b-styling-reshufled/modules/Ubuntu/Components/11/Haptics.qml:172:5: QML ServiceProperties: No such property 'OtherVibrate'
file:///home/tim/dev/ubuntu-ui-toolkit/r/79b-styling-reshufled/examples/ubuntu-ui-toolkit-gallery/NewListItems.qml:100:13: Cannot assign to non-existent property "swipeOvershoot"
QObject::startTimer: Timers can only be used with threads started with QThread

the 2nd one is caused by this MR.

review: Needs Fixing

[Tim Peeters (tpeeters)]

1912 + * \li * \c mouse - (x, y) coordinates of the current mouse/touch point - read-only

Maybe coordinates is a better name? Since on touch screens we don't need a mouse.
Or x and y separate like with the MouseEvent?

[Tim Peeters (tpeeters)]

1913 + * \li * \c last - (x, y) coordinates of the previous mouse/touch point - read-only

Perhaps naming it "previous" is better because "last" may be interpreted as the final coordinates (so they don't change after that)?

[Tim Peeters (tpeeters)]

or "to" and "from" for "mouse" and "last"?

[Zsombor Egri (zsombi)]

> 427 + Object {
>
> as this Object has no children, you can use a QtObject instead.

Done

[Zsombor Egri (zsombi)]

> 1008 + if (swiped == isSwiped) {
> 1009 return;
> 1010 }
> 1011 - this->swiped = swiped;
> 1012 + swiped = isSwiped;
>
>
> Actually I like the style you had here before, using "this->" because that
> makes it immediately clear that this is an instance variable.

Reverted.

[Zsombor Egri (zsombi)]

> When I run the gallery, I get errors:
>
> tim@ubuntu:~/dev/ubuntu-ui-toolkit/r/79b-styling-reshufled$ ./gallery.sh
> file:///home/tim/dev/ubuntu-ui-toolkit/r/79b-styling-
> reshufled/modules/Ubuntu/Components/11/Haptics.qml:172:5: QML
> ServiceProperties: No such property 'OtherVibrate'
> file:///home/tim/dev/ubuntu-ui-toolkit/r/79b-styling-reshufled/examples
> /ubuntu-ui-toolkit-gallery/NewListItems.qml:100:13: Cannot assign to non-
> existent property "swipeOvershoot"
> QObject::startTimer: Timers can only be used with threads started with QThread
>
>
> the 2nd one is caused by this MR.

Fixed, Haptics warning will be fixed in a separate MR.

[Zsombor Egri (zsombi)]

> or "to" and "from" for "mouse" and "last"?

I'll chose these.

[Tim Peeters (tpeeters)]

looks good, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1415
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1438/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1341/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/168/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1339/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1438/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/799/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/106/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/106/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/106/console

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

components.api needs an update

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/800/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/107/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/107
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/107/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/107/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Something very strange happened on jenkins. The autolanding jobs were stuck for 5 days despite jenkins enforcing a timeout of 2 hours. Please reapprove and we'll see if this strangeness happens again.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1417
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1452/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1429
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/179/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/182
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/182/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/179/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1427
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1427/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18180

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1452/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/79b-styling-reshufled]

1418. By Zsombor Egri on 2015-02-19

staging sync

1419. By Zsombor Egri on 2015-02-19

fixing the vertical dragging test which got failed again after merging with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1419
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1457/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/187
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/187/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/184
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1437
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1437/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18192

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1457/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-02-12 14:34:18 +0000
+++ components.api	2015-02-19 08:31:57 +0000
@@ -927,13 +927,11 @@
     name: "UCListItem"
     prototype: "UCStyledItemBase"
     exports: ["ListItem 1.2"]
-    name: "PanelStatus"
     Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
     Property { name: "divider"; type: "UCListItemDivider"; isReadonly: true; isPointer: true }
     Property { name: "leadingActions"; type: "UCListItemActions"; isPointer: true }
     Property { name: "trailingActions"; type: "UCListItemActions"; isPointer: true }
     Property { name: "highlighted"; type: "bool"; isReadonly: true }
-    Property { name: "swipeOvershoot"; type: "double" }
     Property { name: "contentMoving"; type: "bool"; isReadonly: true }
     Property { name: "color"; type: "QColor" }
     Property { name: "highlightColor"; type: "QColor" }
@@ -952,15 +950,6 @@
     Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
     Property { name: "actions"; type: "UCAction"; isList: true; isReadonly: true }
     Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-    name: "UCListItemAttached"
-    prototype: "QObject"
-    Property { name: "actions"; type: "UCListItemActions"; isReadonly: true; isPointer: true }
-    Property { name: "visibleActions"; type: "UCAction"; isList: true; isReadonly: true }
-    Property { name: "index"; type: "int"; isReadonly: true }
-    Property { name: "panelStatus"; type: "UCListItem::PanelStatus"; isReadonly: true }
-    Method {
-    name: "snapToPosition"
-    Parameter { name: "position"; type: "double" }
     name: "UCListItemDivider"
     prototype: "QQuickItem"
     Property { name: "colorFrom"; type: "QColor" }
@@ -968,11 +957,11 @@
     name: "UCListItemStyle"
     prototype: "QQuickItem"
     exports: ["Ubuntu.Components.Styles/ListItemStyle 1.2"]
-    Property { name: "actionsDelegate"; type: "QQmlComponent"; isPointer: true }
-    Property { name: "selectionDelegate"; type: "QQmlComponent"; isPointer: true }
-    Property { name: "dragHandlerDelegate"; type: "QQmlComponent"; isPointer: true }
     Property { name: "snapAnimation"; type: "QQuickAbstractAnimation"; isPointer: true }
-    Property { name: "swipeOvershoot"; type: "double" }
+    Method {
+    name: "swipeEvent"
+    Parameter { name: "event"; type: "UCSwipeEvent"; isPointer: true }
+    Method { name: "rebound" }
     name: "UCMouse"
     prototype: "QObject"
     exports: ["Mouse 0.1", "Mouse 1.0"]
@@ -1048,6 +1037,14 @@
     name: "requestFocus"
     Parameter { name: "reason"; type: "Qt::FocusReason" }
     Method { name: "requestFocus"; revision: 1; type: "bool" }
+    name: "UCSwipeEvent"
+    prototype: "QObject"
+    exports: ["SwipeEvent 1.2"]
+    name: "Status"
+    Property { name: "to"; type: "QPointF"; isReadonly: true }
+    Property { name: "from"; type: "QPointF"; isReadonly: true }
+    Property { name: "content"; type: "QPointF" }
+    Property { name: "status"; type: "Status"; isReadonly: true }
     name: "UCUbuntuAnimation"
     prototype: "QObject"
     exports: ["UbuntuAnimation 0.1", "UbuntuAnimation 1.0"]

=== modified file 'examples/ubuntu-ui-toolkit-gallery/NewListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-01-05 20:55:12 +0000
+++ examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-02-19 08:31:57 +0000
@@ -97,7 +97,6 @@
         }
         ListItemWithLabel {
             text: i18n.tr("Custom action delegates")
-            swipeOvershoot: 0
             leadingActions: ListItemActions {
                 actions: [
                     Action {

=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml	2015-02-06 07:51:31 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml	1970-01-01 00:00:00 +0000
@@ -1,194 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.2
-import Ubuntu.Components 1.2
-
-/*
-  This component is the holder of the ListItem actions.
-  */
-Item {
-
-    // styling properties
-    /*
-      Color of the background.
-      */
-    // FIXME: use Palette colors instead when available
-    property color backgroundColor: (leading ? UbuntuColors.red : "white")
-
-    /*
-      Color used in coloring the icons.
-      */
-    // FIXME: use Palette colors instead when available
-    property color foregroundColor: leading ? "white" : UbuntuColors.darkGrey
-
-    /*
-      Specifies the width of the component visualizing the action.
-      */
-    property real paintedActionWidth: units.gu(2.5)
-
-    // panel implementation
-    id: panel
-    width: Math.max(
-               actionsRow.childrenRect.width,
-               ListItem.visibleActions.length * MathUtils.clamp(paintedActionWidth, height, actionsRow.maxItemWidth))
-
-    // used for module/autopilot testing
-    objectName: "ListItemPanel" + (leading ? "Leading" : "Trailing")
-
-    /*
-      Specifies whether the panel is used to visualize leading or trailing actions.
-      */
-    readonly property bool leading: ListItem.panelStatus == ListItem.Leading
-    readonly property real swipedOffset: leading ? width + x : styledItem.width - x;
-    readonly property bool swiping: styledItem.highlighted && styledItem.contentMoving
-
-    anchors {
-        left: leading ? undefined : styledItem.contentItem.right
-        right: leading ? styledItem.contentItem.left : undefined
-        // anchor to the top of the item but to the bottom of the contentItem, so we do not draw over the divider
-        top: styledItem.top
-        bottom: styledItem.contentItem.bottom
-        bottomMargin: -styledItem.contentItem.anchors.bottomMargin
-        // adjust margins
-        leftMargin: leading ? 0 : styledItem.contentItem.anchors.rightMargin
-        rightMargin: leading ? styledItem.contentItem.anchors.leftMargin : 0
-    }
-
-    Rectangle {
-        objectName: "panel_background"
-        anchors {
-            fill: parent
-            // add 4 times the overshoot margins to cover the background when tugged
-            leftMargin: (leading && styledItem) ? -units.gu(4 * styledItem.swipeOvershoot) : 0
-            rightMargin: (!leading && styledItem) ? -units.gu(4 * styledItem.swipeOvershoot) : 0
-        }
-        color: panel.backgroundColor
-    }
-
-    // handle action triggering
-    Connections {
-        target: styledItem
-        onContentMovementEnded: {
-            if (actionsRow.selectedAction) {
-                actionsRow.selectedAction.trigger(actionsRow.listItemIndex);
-                actionsRow.listItemIndex = -1;
-                actionsRow.selectedAction = null;
-            }
-        }
-    }
-
-    // track drag direction, so we know in which direction we should snap
-    property real prevX: 0.0
-    property real snapChangerLimit: 0.0
-    property real threshold: units.gu(1)
-    property bool snapIn: false
-    onXChanged: {
-        if (prevX < x && (snapChangerLimit <= x)) {
-            snapIn = leading;
-            snapChangerLimit = x - threshold;
-        } else if (prevX > x && (x < snapChangerLimit)) {
-            snapIn = !leading;
-            snapChangerLimit = x + threshold;
-        }
-        prevX = x;
-    }
-    // default snapping!
-    onSwipingChanged: {
-        if (swiping) {
-            // the dragging got started, set prevX
-            prevX = panel.x;
-            return;
-        }
-        if (!visible) {
-            return;
-        }
-        // snap in if the offset is bigger than the overshoot and the direction of the drag is to reveal the panel
-        var snapPos = (swipedOffset > units.gu(2) && snapIn) ? panel.width : 0.0;
-        ListItem.snapToPosition(snapPos);
-    }
-
-    Row {
-        id: actionsRow
-        anchors {
-            left: parent.left
-            top: parent.top
-            bottom: parent.bottom
-            leftMargin: spacing
-        }
-
-        property real maxItemWidth: styledItem.width / panel.ListItem.visibleActions.length
-
-        property Action selectedAction
-        property int listItemIndex: -1
-
-        Repeater {
-            model: panel.ListItem.visibleActions
-            AbstractButton {
-                id: actionButton
-                action: modelData
-                enabled: action.enabled
-                opacity: action.enabled ? 1.0 : 0.5
-                width: MathUtils.clamp(delegateLoader.item ? delegateLoader.item.width : 0, height, actionsRow.maxItemWidth)
-                anchors {
-                    top: parent.top
-                    bottom: parent.bottom
-                }
-                function trigger() {
-                    actionsRow.selectedAction = modelData;
-                    actionsRow.listItemIndex = panel.ListItem.index;
-                    panel.ListItem.snapToPosition(0.0);
-                }
-
-                Rectangle {
-                    anchors.fill: parent
-                    color: Theme.palette.selected.background
-                    visible: pressed
-                }
-
-                Loader {
-                    id: delegateLoader
-                    height: parent.height
-                    sourceComponent: panel.ListItem.actions.delegate ? panel.ListItem.actions.delegate : defaultDelegate
-                    property Action action: modelData
-                    property int index: index
-                    property bool pressed: actionButton.pressed
-                    onItemChanged: {
-                        // use action's objectName to identify the visualized action
-                        if (item && item.objectName === "") {
-                            item.objectName = modelData.objectName;
-                            actionButton.objectName = "actionbutton_" + modelData.objectName
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Component {
-        id: defaultDelegate
-        Item {
-            width: height
-            Icon {
-                width: panel.paintedActionWidth
-                height: width
-                name: action.iconName
-                color: panel.foregroundColor
-                anchors.centerIn: parent
-            }
-        }
-    }
-}

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2015-02-06 09:09:07 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2015-02-19 08:31:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -20,10 +20,233 @@
 
 Styles.ListItemStyle {
 
-    swipeOvershoot: units.gu(2)
-    actionsDelegate: ListItemPanel{}
-
-    snapAnimation: UbuntuNumberAnimation {
-        duration: UbuntuAnimation.SnapDuration
+    id: listItemStyle
+    /*
+     * Take over the ListItem's index context property as repeater used in panel
+     * overrides the property.
+     */
+    readonly property int listItemIndex: index
+
+    // anchoring
+    anchors {
+        top: parent ? parent.top : undefined
+        bottom: parent ? parent.bottom : undefined
+        bottomMargin: styledItem.divider.visible ? styledItem.divider.height : 0
+        left: styledItem.contentItem.left
+        leftMargin: -styledItem.contentItem.anchors.leftMargin
+        right: styledItem.contentItem.right
+        rightMargin: -styledItem.contentItem.anchors.rightMargin
+    }
+
+    // leading/trailing panels
+    Component {
+        id: panelComponent
+        Rectangle {
+            id: panel
+            objectName: "ListItemPanel" + (leading ? "Leading" : "Trailing")
+            property bool leading: false
+            readonly property real panelWidth: actionsRow.width
+
+            // FIXME use theme palette colors once stabilized
+            color: leading ? UbuntuColors.red : "white"
+            anchors.fill: parent
+            width: parent.width
+
+            readonly property ListItemActions itemActions: leading ? styledItem.leadingActions : styledItem.trailingActions
+
+            Row {
+                id: actionsRow
+                anchors {
+                    left: leading ? undefined : parent.left
+                    right: leading ? parent.right : undefined
+                    top: parent.top
+                    bottom: parent.bottom
+                    leftMargin: spacing
+                }
+
+                property real maxItemWidth: parent.width / itemActions.actions.length
+
+                Repeater {
+                    model: itemActions.actions
+                    AbstractButton {
+                        id: actionButton
+                        action: modelData
+                        enabled: action.enabled
+                        opacity: action.enabled ? 1.0 : 0.5
+                        width: MathUtils.clamp(delegateLoader.item ? delegateLoader.item.width : 0, height, actionsRow.maxItemWidth)
+                        anchors {
+                            top: parent ? parent.top : undefined
+                            bottom: parent ? parent.bottom : undefined
+                        }
+                        function trigger() {
+                            internals.selectedAction = modelData;
+                            listItemStyle.rebound();
+                        }
+
+                        Rectangle {
+                            anchors.fill: parent
+                            color: Theme.palette.selected.background
+                            visible: pressed
+                        }
+
+                        Loader {
+                            id: delegateLoader
+                            height: parent.height
+                            sourceComponent: itemActions.delegate ? itemActions.delegate : defaultDelegate
+                            property Action action: modelData
+                            property int index: index
+                            property bool pressed: actionButton.pressed
+                            onItemChanged: {
+                                // use action's objectName to identify the visualized action
+                                if (item && item.objectName === "") {
+                                    item.objectName = modelData.objectName;
+                                    actionButton.objectName = "actionbutton_" + modelData.objectName
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            Component {
+                id: defaultDelegate
+                Item {
+                    width: height
+                    Icon {
+                        width: units.gu(2.5)
+                        height: width
+                        name: action.iconName
+                        // FIXME use theme palette colors once stabilized
+                        color: leading ? "white" : UbuntuColors.darkGrey
+                        anchors.centerIn: parent
+                    }
+                }
+            }
+        }
+    }
+
+    // leading panel loader
+    Loader {
+        id: leadingLoader
+        objectName: "leading_loader"
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            right: parent.left
+        }
+        width: parent.width
+        sourceComponent: styledItem.leadingActions && styledItem.leadingActions.actions.length > 0 ?
+                             panelComponent : null
+        onItemChanged: {
+            if (item) {
+                item.leading = true;
+            }
+        }
+    }
+    // trailing panel loader
+    Loader {
+        id: trailingLoader
+        objectName: "trailing_loader"
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: parent.right
+        }
+        width: parent.width
+        sourceComponent: styledItem.trailingActions && styledItem.trailingActions.actions.length > 0 ?
+                             panelComponent : null
+        onItemChanged: {
+            if (item) {
+                item.leading = false;
+            }
+        }
+    }
+
+    // internals
+    QtObject {
+        id: internals
+        // action triggered
+        property Action selectedAction
+        // swipe handling
+        readonly property Item swipedPanel: listItemStyle.x > 0 ? leadingLoader.item : trailingLoader.item
+        readonly property bool leadingPanel: listItemStyle.x > 0
+        readonly property real swipedOffset: leadingPanel ? listItemStyle.x : -listItemStyle.x
+        readonly property real panelWidth: swipedPanel ? swipedPanel.panelWidth : 0
+        property real prevX: 0.0
+        property real snapChangerLimit: 0.0
+        readonly property real threshold: units.gu(1.5)
+        property bool snapIn: false
+
+        // update snap direction
+        function updateSnapDirection() {
+            if (prevX < listItemStyle.x && (snapChangerLimit <= listItemStyle.x)) {
+                snapIn = leadingPanel;
+                snapChangerLimit = listItemStyle.x - threshold;
+            } else if (prevX > listItemStyle.x && (listItemStyle.x < snapChangerLimit)) {
+                snapIn = !leadingPanel;
+                snapChangerLimit = listItemStyle.x + threshold;
+            }
+            prevX = listItemStyle.x;
+        }
+        // perform snapIn/Out
+        function snap() {
+            var snapPos = (swipedOffset > units.gu(2) && snapIn) ? panelWidth : 0.0;
+            snapPos *= leadingPanel ? 1 : -1;
+            snapAnimation.snapTo(snapPos);
+        }
+        // handle elasticity on overshoot
+        function overshoot(event) {
+            var offset = event.content.x - styledItem.contentItem.anchors.leftMargin;
+            offset *= leadingPanel ? 1 : -1;
+            if (offset > panelWidth) {
+                // do elastic move
+                event.content.x = styledItem.contentItem.x + (event.to.x - event.from.x) / 2;
+            }
+        }
+    }
+    snapAnimation: SmoothedAnimation {
+        objectName: "snap_animation"
+        target: styledItem.contentItem
+        property: "x"
+        // use 50GU/second velocity
+        velocity: units.gu(60)
+        onStopped: {
+            // trigger action
+            if (to == styledItem.contentItem.anchors.leftMargin && internals.selectedAction) {
+                internals.selectedAction.trigger(listItemIndex);
+                internals.selectedAction = null;
+            }
+        }
+        // animated snapping
+        function snapTo(pos) {
+            if (pos == to && styledItem.contentItem.x == to) {
+                return;
+            }
+
+            stop();
+            from = styledItem.contentItem.x;
+            if (!pos) {
+                pos = styledItem.contentItem.anchors.leftMargin;
+            }
+            to = pos;
+            start();
+        }
+    }
+
+    onXChanged: internals.updateSnapDirection()
+    // overriding default functions
+    function swipeEvent(event) {
+        if (event.status == SwipeEvent.Started) {
+            internals.prevX = x;
+            snapAnimation.stop();
+        } else if (event.status == SwipeEvent.Finished) {
+            internals.snap();
+        } else if (event.status == SwipeEvent.Updated) {
+            // handle elasticity when overshooting
+            internals.overshoot(event)
+        }
+    }
+    function rebound() {
+        snapAnimation.snapTo(0);
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/qmldir'
--- modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-12-02 15:00:37 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/qmldir	2015-02-19 08:31:57 +0000
@@ -56,5 +56,4 @@
 internal HeadDividerStyle HeadDividerStyle.qml
 
 #version 1.2
-ListItemPanel 1.2 ListItemPanel.qml
 ListItemStyle 1.2 ListItemStyle.qml

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2015-02-10 16:47:59 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2015-02-19 08:31:57 +0000
@@ -170,10 +170,11 @@
     qmlRegisterType<UCServiceProperties, 1>(uri, 1, 1, "ServiceProperties");
 
     // ListItem and related types, released to 1.2
-    qmlRegisterType<UCListItem, 2>(uri, 1, 2, "ListItem");
+    qmlRegisterType<UCListItem>(uri, 1, 2, "ListItem");
     qmlRegisterType<UCListItemDivider>();
-    qmlRegisterType<UCListItemActions, 2>(uri, 1, 2, "ListItemActions");
-    qmlRegisterUncreatableType<UCViewItemsAttached, 2>(uri, 1, 2, "ViewItems", "Not instantiable");
+    qmlRegisterUncreatableType<UCSwipeEvent>(uri, 1, 2, "SwipeEvent", "This is an event object.");
+    qmlRegisterType<UCListItemActions>(uri, 1, 2, "ListItemActions");
+    qmlRegisterUncreatableType<UCViewItemsAttached>(uri, 1, 2, "ViewItems", "Not instantiable");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2015-02-10 16:47:59 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2015-02-19 08:31:57 +0000
@@ -118,8 +118,6 @@
     propertychange_p.cpp \
     uclistitemstyle.cpp \
     ucviewitemsattached.cpp \
-    uclistitemattached.cpp \
-    ucactionpanel_p.cpp \
     ucserviceproperties.cpp
 
 # adapters

=== removed file 'modules/Ubuntu/Components/plugin/ucactionpanel_p.cpp'
--- modules/Ubuntu/Components/plugin/ucactionpanel_p.cpp	2015-02-06 07:51:31 +0000
+++ modules/Ubuntu/Components/plugin/ucactionpanel_p.cpp	1970-01-01 00:00:00 +0000
@@ -1,134 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "uclistitemactions.h"
-#include "uclistitemactions_p.h"
-#include "uclistitem_p.h"
-#include "quickutils.h"
-#include "i18n.h"
-#include "plugin.h"
-#include <QtQml/QQmlInfo>
-#include "ucaction.h"
-#include "ucunits.h"
-#include "uclistitemstyle.h"
-
-UCActionPanel::UCActionPanel(UCListItem *item, bool leading)
-    : QObject(item)
-    , listItem(item)
-    , panelItem(0)
-    , status(UCListItem::None)
-    , leading(leading)
-    , connected(false)
-{
-
-}
-
-UCActionPanel::~UCActionPanel()
-{
-}
-
-UCListItemAttached *UCActionPanel::attachedObject()
-{
-    if (!panelItem) {
-        return 0;
-    }
-    return static_cast<UCListItemAttached*>(
-                qmlAttachedPropertiesObject<UCListItem>(panelItem, false));
-}
-
-bool UCActionPanel::createPanel(QQmlComponent *panelDelegate)
-{
-    if (panelItem || !panelDelegate) {
-        return false;
-    }
-    if (!panelDelegate->isError()) {
-        // use ListItem's style context to be able to access ther styledItem context property
-        UCListItemPrivate *pListItem = UCListItemPrivate::get(listItem);
-        QQmlContext *parentContext = qmlContext(pListItem->styleItem);
-        QQmlContext *context = new QQmlContext(parentContext, parentContext);
-        panelItem = qobject_cast<QQuickItem*>(panelDelegate->beginCreate(context));
-        if (!panelItem) {
-            qmlInfo(listItem) << UbuntuI18n::tr("Error creating ListItem actions panel");
-        } else {
-            QQml_setParent_noEvent(panelItem, listItem);
-            panelItem->setParentItem(listItem);
-            // create attached property!
-            UCListItemAttached *attached = static_cast<UCListItemAttached*>(
-                        qmlAttachedPropertiesObject<UCListItem>(panelItem));
-            if (!attached->actions()) {
-                attached->setList(listItem, leading, true);
-            } else {
-                // container is set, but we need to emit the signal again so we get the
-                // attached props updated for those cases when the attached property is
-                // created before the statement above
-                Q_EMIT attached->actionsChanged();
-            }
-            panelDelegate->completeCreate();
-        }
-    } else {
-        qmlInfo(listItem) << panelDelegate->errorString();
-    }
-    return panelItem != 0;
-}
-
-UCListItemActions *UCActionPanel::actions()
-{
-    return leading ? UCListItemPrivate::get(listItem)->leadingActions :
-                     UCListItemPrivate::get(listItem)->trailingActions;
-}
-
-QQuickItem *UCActionPanel::panel() const
-{
-    return panelItem;
-}
-
-bool UCActionPanel::grabPanel(UCActionPanel **panel, UCListItem *item, bool leading)
-{
-    if (!(*panel) && item) {
-        UCListItemActions *actions = leading ? UCListItemPrivate::get(item)->leadingActions :
-                                             UCListItemPrivate::get(item)->trailingActions;
-        if (actions) {
-            (*panel) = new UCActionPanel(item, leading);
-            UCListItemPrivate *pItem = UCListItemPrivate::get((*panel)->listItem);
-            pItem->initStyleItem();
-            if (!pItem->styleItem ||
-                    (pItem->styleItem && !(*panel)->createPanel(pItem->styleItem->m_actionsDelegate))) {
-                delete (*panel);
-                (*panel) = 0;
-            }
-        }
-    }
-    if (*panel) {
-        (*panel)->connected = true;
-        (*panel)->status = leading ? UCListItem::Leading : UCListItem::Trailing;
-        Q_EMIT (*panel)->statusChanged();
-    }
-    return (*panel) != 0;
-}
-
-void UCActionPanel::ungrabPanel(UCActionPanel *panel)
-{
-    if (!panel || !panel->connected) {
-        return;
-    }
-    panel->connected = false;
-    panel->panelItem->setVisible(false);
-}
-
-bool UCActionPanel::isConnected(UCActionPanel *panel)
-{
-    return panel && panel->connected;
-}

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-02-10 13:44:25 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-02-19 08:31:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -49,183 +49,6 @@
     }
     return result;
 }
-/******************************************************************************
- * SnapAnimator
- *
- * The class handles the animation executed when the ListItemAction panel is
- * swiped. The animation is executed from the swipe position the mouse/touch is
- * released to the desired position given in snap(). The action panel is assumed
- * to be anchored to the ListItem.contentItem left or right, depending on which
- * action list is swiped in. Therefore the animator only changes the ListItem.contentItem
- * x coordinate.
- * The animation is defined by the style.
- */
-ListItemAnimator::ListItemAnimator(QObject *parent)
-    : QObject(parent)
-    , activeAnimations(0)
-    , item(0)
-{
-}
-ListItemAnimator::~ListItemAnimator()
-{
-    stop();
-    // make sure we cannot animate anymore, for safety
-    item = 0;
-}
-
-/*
- * Snap the ListItem.contentItem in or out, depending on the position specified
- * in "to" parameter. If the position is 0, a snap out will be executed - see
- * snapOut(). In any other cases a snap in action will be performed - see snapIn().
- */
-bool ListItemAnimator::snap(qreal to)
-{
-    if (!item) {
-        return false;
-    }
-    UCListItemPrivate *listItem = UCListItemPrivate::get(item);
-    bool doSnapOut = (to == 0.0);
-    activeAnimations |= (doSnapOut ? SnapOutAnimation : SnapInAnimation);
-    // fix snap position, take leftMargin into account!
-    to += QQuickItemPrivate::get(listItem->contentItem)->anchors()->leftMargin();
-    if (to == listItem->contentItem->x()) {
-        // there was no move, so we only do some cleanup
-        completeAnimation();
-        return true;
-    }
-
-    QQuickAbstractAnimation *snap = getSnapBehavior();
-    if (snap) {
-        snap->setAlwaysRunToEnd(false);
-        connect(snap, &QQuickAbstractAnimation::runningChanged,
-                this, &ListItemAnimator::completeAnimation,
-                Qt::DirectConnection);
-    }
-    listItem->setContentMoving(true);
-    if (snapBehavior) {
-        snapBehavior->setEnabled(true);
-        snapBehavior->write(to);
-    }
-    if (!snap) {
-        // complete, as we don't have animation
-        completeAnimation();
-    }
-    return true;
-}
-
-/*
- * The function completes a running snap animation.
- */
-void ListItemAnimator::stop()
-{
-    if (snapBehavior && snapBehavior->enabled()) {
-        QQuickAbstractAnimation *animation = snapBehavior->animation();
-        if (animation) {
-            // set animation to be user controlled temporarily so we can invoke stop()
-            animation->setEnableUserControl();
-            animation->stop();
-            animation->setDisableUserControl();
-        }
-        snapBehavior->setEnabled(false);
-    }
-}
-
-// handles animation completion
-void ListItemAnimator::completeAnimation()
-{
-    QQuickAbstractAnimation *animation = static_cast<QQuickAbstractAnimation*>(sender());
-    if (animation && animation->isRunning()) {
-        return;
-    }
-
-    // complete animations
-    UCListItemPrivate *listItem = UCListItemPrivate::get(item);
-    if (activeAnimations & SnapInAnimation) {
-        listItem->snapIn();
-        activeAnimations &= ~SnapInAnimation;
-    } else if (activeAnimations & SnapOutAnimation) {
-        listItem->snapOut();
-        activeAnimations &= ~SnapOutAnimation;
-    }
-
-    // clean animations
-    if (animation && !activeAnimations) {
-        disconnect(animation, &QQuickAbstractAnimation::runningChanged,
-                   this, &ListItemAnimator::completeAnimation);
-    }
-    if (snapBehavior && snapBehavior->enabled()) {
-        snapBehavior->setEnabled(false);
-    }
-}
-
-/*
- * Snap out is performed when the ListItem.contentItem returns back to its original
- * X coordinates (0). At this point both leading and trailing action panels will
- * be disconnected, ascending Flickables will get unlocked (interactive value restored
- * to the state before they were locked) and ListItem.contentMoving will be reset.
- */
-void UCListItemPrivate::snapOut()
-{
-    setHighlighted(false);
-    setSwiped(false);
-    if (parentAttached) {
-        Q_Q(UCListItem);
-        // restore flickable's interactive and cleanup
-        parentAttached->disableInteractive(q, false);
-        // no need to listen flickables any longer
-        listenToRebind(false);
-    }
-    // disconnect actions
-    UCActionPanel::ungrabPanel(leadingPanel);
-    UCActionPanel::ungrabPanel(trailingPanel);
-    // lock contentItem left/right edges
-    lockContentItem(true);
-    // set contentMoved to false
-    setContentMoving(false);
-}
-
-/*
- * Snap in only resets the ListItem.contentMoving property, but will keep leading/trailing
- * actions connected as well as all ascendant Flickables locked (interactive = false).
- */
-void UCListItemPrivate::snapIn()
-{
-    // turn content moving off
-    setContentMoving(false);
-}
-
-/*
- * Returns the animation specified by the style, and configures the snapBehavior
- * controlling the animation.
- */
-QQuickAbstractAnimation *ListItemAnimator::getSnapBehavior()
-{
-    if (snapBehavior) {
-        return snapBehavior->animation();
-    }
-
-    UCListItemPrivate *listItem = UCListItemPrivate::get(item);
-    // in order to get Behavior working properly, it must be created to have
-    // ListItem.contentItem as parent, and must be in the same context as its
-    // parent item
-    snapBehavior = new QQuickBehavior(listItem->contentItem);
-    snapBehavior->setParent(listItem->contentItem);
-    QQmlContext *context = qmlContext(listItem->contentItem);
-    QQmlEngine::setContextForObject(snapBehavior.data(), context);
-
-    listItem->initStyleItem();
-    QQuickAbstractAnimation *animation = listItem->styleItem ? listItem->styleItem->m_snapAnimation : 0;
-    if (animation) {
-        // patch behavior, use the same context as the animation
-        snapBehavior->setAnimation(animation);
-
-        // transfer animation to the contentItem
-        animation->setParent(listItem->contentItem);
-    }
-    QQmlProperty property(listItem->contentItem, "x", context);
-    snapBehavior->setTarget(property);
-    return animation;
-}
 
 /******************************************************************************
  * Divider
@@ -375,10 +198,7 @@
     , suppressClick(false)
     , ready(false)
     , customColor(false)
-    , customOvershoot(false)
-    , flicked(false)
     , xAxisMoveThresholdGU(DEFAULT_SWIPE_THRESHOLD_GU)
-    , overshoot(0)
     , color(Qt::transparent)
     , highlightColor(Qt::transparent)
     , parentAttached(0)
@@ -386,8 +206,6 @@
     , divider(new UCListItemDivider)
     , leadingActions(0)
     , trailingActions(0)
-    , leadingPanel(0)
-    , trailingPanel(0)
     , mainAction(0)
     , styleComponent(0)
     , implicitStyleComponent(0)
@@ -401,7 +219,6 @@
 void UCListItemPrivate::init()
 {
     Q_Q(UCListItem);
-    animator.init(q);
     contentItem->setObjectName("ListItemHolder");
     QQml_setParent_noEvent(contentItem, q);
     contentItem->setParentItem(q);
@@ -415,6 +232,10 @@
     // turn activeFocusOnPress on
     q->setActiveFocusOnPress(true);
 
+    // update swiped state
+    QObject::connect(contentItem, SIGNAL(xChanged()),
+                     q, SLOT(_q_updateSwiping()), Qt::DirectConnection);
+
     // catch theme changes
     QObject::connect(&UCTheme::instance(), SIGNAL(nameChanged()), q, SLOT(_q_updateThemedData()));
     _q_updateThemedData();
@@ -478,6 +299,12 @@
     q->update();
 }
 
+// update contentMoving property when ListItemStyle.snapAnimation stopped() signal is emitted
+void UCListItemPrivate::_q_contentMoving()
+{
+    setContentMoving(styleItem->m_snapAnimation->isRunning());
+}
+
 /*!
  * \qmlproperty Component ListItem::style
  * Holds the style of the component defining the components visualizing the leading/
@@ -536,8 +363,10 @@
         delete implicitStyleComponent;
         Q_Q(UCListItem);
         implicitStyleComponent = UCTheme::instance().createStyleComponent("ListItemStyle.qml", q);
-        // set the objectnane for testing in tst_listitems.qml
-        implicitStyleComponent->setObjectName("ListItemThemeStyle");
+        if (implicitStyleComponent) {
+            // set the objectnane for testing in tst_listitems.qml
+            implicitStyleComponent->setObjectName("ListItemThemeStyle");
+        }
         // re-create style instance if it was created using the implicit style
         if (reloadStyle) {
             initStyleItem();
@@ -567,8 +396,12 @@
         qmlInfo(q) << delegate->errorString();
         return;
     }
-    QQmlContext *context = new QQmlContext(qmlContext(q));
+    QQmlContext *context = new QQmlContext(qmlContext(q), qmlContext(q));
     context->setContextProperty("styledItem", q);
+    // also declare index property in case not defined
+    if (!context->contextProperty("index").isValid()) {
+        context->setContextProperty("index", index());
+    }
     QObject *object = delegate->beginCreate(context);
     styleItem = qobject_cast<UCListItemStyle*>(object);
     if (!styleItem) {
@@ -577,16 +410,10 @@
         delete context;
         return;
     }
-    context->setParent(styleItem);
     QQml_setParent_noEvent(styleItem, q);
+    styleItem->setParentItem(q);
     delegate->completeCreate();
     Q_EMIT q->__styleInstanceChanged();
-
-    // get the overshoot value from the style!
-    if (!customOvershoot) {
-        overshoot = styleItem->m_swipeOvershoot;
-        Q_EMIT q->swipeOvershootChanged();
-    }
 }
 
 /*!
@@ -658,7 +485,15 @@
         Q_EMIT q->highlightedChanged();
     }
 }
-// toggles the tugged flag and installs/removes event filter
+// toggles the swiped flag and installs/removes event filter to capture pointer events outside
+// of list item area
+void UCListItemPrivate::_q_updateSwiping()
+{
+    if (swiped) {
+        setSwiped((contentItem->position() != zeroPos) || highlighted);
+    }
+}
+
 void UCListItemPrivate::setSwiped(bool swiped)
 {
     suppressClick = swiped;
@@ -672,6 +507,8 @@
         window->installEventFilter(q);
     } else {
         window->removeEventFilter(q);
+        // lock contentItem left/right edges
+        lockContentItem(true);
     }
 }
 
@@ -691,6 +528,7 @@
     if (lock) {
         contentAnchors->setLeft(left());
         contentAnchors->setRight(right());
+        zeroPos = contentItem->position();
     } else {
         contentAnchors->resetLeft();
         contentAnchors->resetRight();
@@ -706,17 +544,50 @@
     q->update();
 }
 
-// clamps the X value and moves the contentItem to the new X value
-void UCListItemPrivate::clampAndMoveX(qreal &x, qreal dx)
-{
-    x += dx;
-    // min cannot be less than the trailing's panel width
-    QQuickItem *leadingPanelItem = leadingPanel ? leadingPanel->panel() : 0;
-    QQuickItem *trailingPanelItem = trailingPanel ? trailingPanel->panel() : 0;
-    qreal min = (trailingPanelItem) ? -trailingPanelItem->width() - overshoot: 0;
-    // max cannot be bigger than 0 or the leading's width in case we have leading panel
-    qreal max = (leadingPanelItem) ? leadingPanelItem->width() + overshoot: 0;
-    x = CLAMP(x, min, max);
+/*
+ * Snap out is performed when the ListItem.contentItem returns back to its original
+ * X coordinates (0). At this point both leading and trailing action panels will
+ * be disconnected, ascending Flickables will get unlocked (interactive value restored
+ * to the state before they were locked) and ListItem.contentMoving will be reset.
+ */
+void UCListItemPrivate::snapOut()
+{
+    if (!ready) {
+        return;
+    }
+    setHighlighted(false);
+    if (parentAttached) {
+        Q_Q(UCListItem);
+        // restore flickable's interactive and cleanup
+        parentAttached->disableInteractive(q, false);
+        // no need to listen flickables any longer
+        listenToRebind(false);
+    }
+    if (styleItem) {
+        styleItem->invokeRebound();
+    }
+}
+
+// emits the style signal swipeEvent()
+void UCListItemPrivate::swipeEvent(const QPointF &localPos, UCSwipeEvent::Status status)
+{
+    UCSwipeEvent event(localPos, lastPos, contentItem->position() + (localPos - lastPos), status);
+    // clamp to the edges if the edge (leading/trailing) doesn't have actions defined
+    if ((event.m_contentPos.x() < zeroPos.x() && !trailingActions) ||
+        (event.m_contentPos.x() > zeroPos.x() && !leadingActions)) {
+        event.m_contentPos = zeroPos;
+    }
+    if (styleItem) {
+        styleItem->invokeSwipeEvent(&event);
+    }
+    if (event.m_contentPos != contentItem->position()) {
+        contentItem->setPosition(event.m_contentPos);
+        lastPos = localPos;
+        if (status == UCSwipeEvent::Updated) {
+            setContentMoving(true);
+            setSwiped(true);
+        }
+    }
 }
 
 /*!
@@ -814,7 +685,7 @@
  * or to the back of the item, and are revealed by swiping the item horizontally.
  * The swipe is started only after the mouse/touch move had passed a given threshold.
  * The actions are visualized by a panel, which is configurable through the \l
- * ListItemStyle::actionsDelegate style property.
+ * ListItemStyle.
  *
  * The actions are configured through the \l leadingActions as well as \l
  * trailingActions properties.
@@ -898,11 +769,6 @@
 {
 }
 
-UCListItemAttached *UCListItem::qmlAttachedProperties(QObject *owner)
-{
-    return new UCListItemAttached(owner);
-}
-
 void UCListItem::componentComplete()
 {
     UCStyledItemBase::componentComplete();
@@ -1017,22 +883,19 @@
         // while moving, we cannot select any items
         return;
     }
-    if (d->canHighlight(event) && !d->suppressClick
+    if (d->canHighlight(event)
             && !d->highlighted && event->button() == Qt::LeftButton) {
-        // stop any ongoing animation!
-        d->animator.stop();
+        // create style instance
+        d->initStyleItem();
         d->setHighlighted(true);
         d->lastPos = d->pressedPos = event->localPos();
         // connect the Flickable to know when to rebound
         d->listenToRebind(true);
-        // if it was moved, grab the panels
-        if (d->swiped) {
-            UCActionPanel::grabPanel(&d->leadingPanel, this, true);
-            UCActionPanel::grabPanel(&d->trailingPanel, this, false);
-            if (d->parentAttached) {
-                d->parentAttached->disableInteractive(this, true);
-            }
+        if (d->swiped && d->parentAttached) {
+            d->parentAttached->disableInteractive(this, true);
         }
+        // stop any ongoing animation!
+        d->swipeEvent(event->localPos(), UCSwipeEvent::Started);
     }
     // accept the event so we get the rest of the events as well
     event->setAccepted(true);
@@ -1044,6 +907,7 @@
     Q_D(UCListItem);
     // set released
     if (d->highlighted) {
+        // unblock ascending Flickables
         d->listenToRebind(false);
         if (d->parentAttached) {
             d->parentAttached->disableInteractive(this, false);
@@ -1057,8 +921,10 @@
                     Q_EMIT d->mainAction->trigger(d->index());
                 }
             }
-            d->animator.snap(0);
+            d->snapOut();
         } else {
+            // inform style about mouse/touch release
+            d->swipeEvent(event->localPos(), UCSwipeEvent::Finished);
             d->suppressClick = false;
         }
     }
@@ -1070,10 +936,10 @@
     Q_D(UCListItem);
     UCStyledItemBase::mouseMoveEvent(event);
 
+//    qDebug() << "MOVE" << event->localPos();
+
     // accept the tugging only if the move is within the threshold
-    bool leadingAttached = UCActionPanel::isConnected(d->leadingPanel);
-    bool trailingAttached = UCActionPanel::isConnected(d->trailingPanel);
-    if (d->highlighted && !(leadingAttached || trailingAttached)) {
+    if (d->highlighted && !d->swiped && (d->leadingActions || d->trailingActions)) {
         // check if we can initiate the drag at all
         // only X direction matters, if Y-direction leaves the threshold, but X not, the tug is not valid
         qreal threshold = UCUnits::instance().gu(d->xAxisMoveThresholdGU);
@@ -1083,54 +949,21 @@
         if ((mouseX < (pressedX - threshold)) || (mouseX > (pressedX + threshold))) {
             // the press went out of the threshold area, enable move, if the direction allows it
             d->lastPos = event->localPos();
-            // tries to connect both panels so we do no longer need to take care which
-            // got connected ad which not; this may fail in case of shared ListItemActions,
-            // as then the panel is shared between the list items, and the panel might be
-            // still in use in other panels. See UCListItemActionsPrivate::connectToListItem
-            leadingAttached = UCActionPanel::grabPanel(&d->leadingPanel, this, true);
-            trailingAttached = UCActionPanel::grabPanel(&d->trailingPanel, this, false);
             // unlock contentItem's left/right edges
             d->lockContentItem(false);
             if (d->parentAttached) {
                 d->parentAttached->disableInteractive(this, true);
             }
-        }
-    }
-
-    if (leadingAttached || trailingAttached) {
-        qreal x = d->contentItem->x();
-        qreal dx = event->localPos().x() - d->lastPos.x();
-        d->lastPos = event->localPos();
-
-        if (dx) {
-            // stop pressAndHold timer as we started to drag
-            d->pressAndHoldTimer.stop();
-            d->setContentMoving(true);
-            // clamp X into allowed dragging area
-            d->clampAndMoveX(x, dx);
-            // block flickable
             d->setSwiped(true);
-            d->contentItem->setX(x);
-            // decide which panel is visible by checking the contentItem's X coordinates
-            qreal margin = QQuickItemPrivate::get(d->contentItem)->anchors()->leftMargin();
-            if (d->contentItem->x() > margin) {
-                if (d->leadingPanel) {
-                    d->leadingPanel->panel()->setVisible(true);
-                }
-                if (d->trailingPanel) {
-                    d->trailingPanel->panel()->setVisible(false);
-                }
-            } else if (d->contentItem->x() < margin) {
-                // trailing revealed
-                if (d->leadingPanel) {
-                    d->leadingPanel->panel()->setVisible(false);
-                }
-                if (d->trailingPanel) {
-                    d->trailingPanel->panel()->setVisible(true);
-                }
-            }
         }
     }
+
+    if (d->swiped) {
+        d->pressAndHoldTimer.stop();
+
+        // send swipe event to style and update contentItem position
+        d->swipeEvent(event->localPos(), UCSwipeEvent::Updated);
+    }
 }
 
 bool UCListItem::childMouseEventFilter(QQuickItem *child, QEvent *event)
@@ -1173,7 +1006,7 @@
     }
     if (!myPos.isNull() && !contains(myPos)) {
         Q_D(UCListItem);
-        d->animator.snap(0);
+        d->snapOut();
         // only accept event, but let it be handled by the underlying or surrounding Flickables
         event->accept();
     }
@@ -1215,9 +1048,6 @@
     }
     // snap out before we change the actions
     d->snapOut();
-    // then delete panel
-    delete d->leadingPanel;
-    d->leadingPanel = 0;
     d->leadingActions = actions;
     Q_EMIT leadingActionsChanged();
 }
@@ -1243,9 +1073,6 @@
     }
     // snap out before we change the actions
     d->snapOut();
-    // then delete panel
-    delete d->trailingPanel;
-    d->trailingPanel = 0;
     d->trailingActions = actions;
     Q_EMIT trailingActionsChanged();
 }
@@ -1465,43 +1292,6 @@
 }
 
 /*!
- * \qmlproperty real ListItem::swipeOvershoot
- * The property configures the overshoot value on swiping. Its default value is
- * configured by the \l {ListItemStyle}{style}. Any positive value overrides the
- * default value, and any negative or undefined value resets it back to the default.
- */
-qreal UCListItemPrivate::swipeOvershoot() const
-{
-    return overshoot;
-}
-void UCListItemPrivate::setSwipeOvershoot(qreal overshoot)
-{
-    // mark any positive value as custom even if it is the same as the previous one
-    customOvershoot = (overshoot >= 0.0);
-    // same value should be guarded only if the style hasn't been loaded yet
-    // swipeOvershoot can be set to 0 prior the style is loaded.
-    if (this->overshoot == overshoot && styleItem) {
-        return;
-    }
-    if (!customOvershoot) {
-        resetSwipeOvershoot();
-        return;
-    }
-    this->overshoot = overshoot;
-    update();
-    Q_Q(UCListItem);
-    Q_EMIT q->swipeOvershootChanged();
-}
-void UCListItemPrivate::resetSwipeOvershoot()
-{
-    customOvershoot = false;
-    overshoot = styleItem ? styleItem->m_swipeOvershoot : 0.0;
-    update();
-    Q_Q(UCListItem);
-    Q_EMIT q->swipeOvershootChanged();
-}
-
-/*!
  * \qmlproperty list<Object> ListItem::listItemData
  * \default
  * \internal

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.h'
--- modules/Ubuntu/Components/plugin/uclistitem.h	2015-02-06 07:51:31 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.h	2015-02-19 08:31:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -24,7 +24,6 @@
 class UCListItemDivider;
 class UCListItemActions;
 class UCAction;
-class UCListItemAttached;
 class UCListItemPrivate;
 class UCListItem : public UCStyledItemBase
 {
@@ -34,7 +33,6 @@
     Q_PROPERTY(UCListItemActions *leadingActions READ leadingActions WRITE setLeadingActions NOTIFY leadingActionsChanged DESIGNABLE false)
     Q_PROPERTY(UCListItemActions *trailingActions READ trailingActions WRITE setTrailingActions NOTIFY trailingActionsChanged DESIGNABLE false)
     Q_PROPERTY(bool highlighted READ highlighted NOTIFY highlightedChanged)
-    Q_PRIVATE_PROPERTY(UCListItem::d_func(), qreal swipeOvershoot READ swipeOvershoot WRITE setSwipeOvershoot RESET resetSwipeOvershoot NOTIFY swipeOvershootChanged)
     Q_PRIVATE_PROPERTY(UCListItem::d_func(), bool contentMoving READ contentMoving NOTIFY contentMovingChanged)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
     Q_PROPERTY(QColor highlightColor READ highlightColor WRITE setHighlightColor RESET resetHighlightColor NOTIFY highlightColorChanged)
@@ -45,18 +43,10 @@
     Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQmlComponent *style READ style WRITE setStyle RESET resetStyle NOTIFY styleChanged)
     Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQuickItem *__styleInstance READ styleInstance NOTIFY __styleInstanceChanged)
     Q_CLASSINFO("DefaultProperty", "listItemData")
-    Q_ENUMS(PanelStatus)
 public:
-    enum PanelStatus {
-        None,
-        Leading,
-        Trailing
-    };
     explicit UCListItem(QQuickItem *parent = 0);
     ~UCListItem();
 
-    static UCListItemAttached *qmlAttachedProperties(QObject *owner);
-
     QQuickItem *contentItem() const;
     UCListItemDivider *divider() const;
     UCListItemActions *leadingActions() const;
@@ -85,7 +75,6 @@
     void leadingActionsChanged();
     void trailingActionsChanged();
     void highlightedChanged();
-    void swipeOvershootChanged();
     void contentMovingChanged();
     void colorChanged();
     void highlightColorChanged();
@@ -95,22 +84,23 @@
     void clicked();
     void pressAndHold();
 
+    void contentMovementStarted();
+    void contentMovementEnded();
+
     void styleChanged();
     void __styleInstanceChanged();
 
-    void contentMovementStarted();
-    void contentMovementEnded();
-
 public Q_SLOTS:
 
 private:
     Q_DECLARE_PRIVATE(UCListItem)
     Q_PRIVATE_SLOT(d_func(), void _q_updateThemedData())
     Q_PRIVATE_SLOT(d_func(), void _q_relayout())
+    Q_PRIVATE_SLOT(d_func(), void _q_updateSwiping())
     Q_PRIVATE_SLOT(d_func(), void _q_updateSize())
     Q_PRIVATE_SLOT(d_func(), void _q_updateIndex())
+    Q_PRIVATE_SLOT(d_func(), void _q_contentMoving())
 };
-QML_DECLARE_TYPEINFO(UCListItem, QML_HAS_ATTACHED_PROPERTIES)
 
 class UCListItemDividerPrivate;
 class UCListItemDivider : public QQuickItem
@@ -140,45 +130,6 @@
     Q_DECLARE_PRIVATE(UCListItemDivider)
 };
 
-class UCAction;
-class UCListItemActions;
-class UCListItemAttachedPrivate;
-class UCListItemAttached : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(UCListItemActions *actions READ actions NOTIFY actionsChanged)
-    Q_PROPERTY(QQmlListProperty<UCAction> visibleActions READ visibleActions NOTIFY visibleActionsChanged)
-    Q_PROPERTY(int index READ index NOTIFY indexChanged)
-    Q_PROPERTY(UCListItem::PanelStatus panelStatus READ panelStatus NOTIFY panelStatusChanged)
-public:
-    UCListItemAttached(QObject *parent = 0);
-    ~UCListItemAttached();
-    void setList(UCListItem *list, bool leading, bool visualizeActions);
-
-    UCListItemActions *actions() const;
-    QQmlListProperty<UCAction> visibleActions();
-    UCListItem *item();
-    int index();
-    UCListItem::PanelStatus panelStatus();
-
-public Q_SLOTS:
-    void snapToPosition(qreal position);
-
-Q_SIGNALS:
-    void actionsChanged();
-    void visibleActionsChanged();
-    void indexChanged();
-    void panelStatusChanged();
-
-private:
-    Q_DECLARE_PRIVATE(UCListItemAttached)
-    friend class UCListItemAction;
-
-private Q_SLOTS:
-    void updateVisibleActions();
-};
-
-
 class UCViewItemsAttachedPrivate;
 class UCViewItemsAttached : public QObject
 {

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-02-06 07:54:50 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-02-19 08:31:57 +0000
@@ -19,53 +19,15 @@
 
 #include "uclistitem.h"
 #include "ucstyleditembase_p.h"
+#include "uclistitemstyle.h"
 #include <QtCore/QPointer>
 #include <QtCore/QBasicTimer>
 #include <QtQuick/private/qquickrectangle_p.h>
 
-#define MIN(x, y)           ((x < y) ? x : y)
-#define MAX(x, y)           ((x > y) ? x : y)
-#define CLAMP(v, min, max)  (min <= max) ? MAX(min, MIN(v, max)) : MAX(max, MIN(v, min))
-
 #define IMPLICIT_LISTITEM_WIDTH_GU      40
 #define IMPLICIT_LISTITEM_HEIGHT_GU     7
 #define DIVIDER_THICKNESS_DP            2
 #define DEFAULT_SWIPE_THRESHOLD_GU      1.5
-#define LAYOUT_HMARGIN_GU               2
-#define LAYOUT_VMARGIN_GU               0.5
-
-class QQuickAbstractAnimation;
-class QQuickBehavior;
-class ListItemAnimator : public QObject
-{
-    Q_OBJECT
-public:
-    enum Animation {
-        SnapInAnimation     = 0x01,
-        SnapOutAnimation    = 0x02
-    };
-
-    ListItemAnimator(QObject *parent = 0);
-    ~ListItemAnimator();
-    void init(UCListItem *listItem)
-    {
-        item = listItem;
-    }
-
-    bool snap(qreal to);
-    void stop();
-
-public Q_SLOTS:
-    void completeAnimation();
-
-private:
-    QQuickAbstractAnimation *getSnapBehavior();
-
-private:
-    int activeAnimations;
-    UCListItem *item;
-    QPointer<QQuickBehavior> snapBehavior;
-};
 
 class QQuickFlickable;
 class UCListItemDivider;
@@ -90,18 +52,19 @@
     bool isPressAndHoldConnected();
     void _q_updateThemedData();
     void _q_relayout();
+    void _q_updateSwiping();
+    void setSwiped(bool swiped);
     void _q_updateSize();
     void _q_updateIndex();
+    void _q_contentMoving();
     int index();
     bool canHighlight(QMouseEvent *event);
     void setHighlighted(bool pressed);
-    void setSwiped(bool tugged);
     void listenToRebind(bool listen);
     void lockContentItem(bool lock);
     void update();
-    void clampAndMoveX(qreal &x, qreal dx);
     void snapOut();
-    void snapIn();
+    void swipeEvent(const QPointF &localPos, UCSwipeEvent::Status status);
 
     bool highlighted:1;
     bool contentMoved:1;
@@ -109,13 +72,11 @@
     bool suppressClick:1;
     bool ready:1;
     bool customColor:1;
-    bool customOvershoot:1;
-    bool flicked:1;
     qreal xAxisMoveThresholdGU;
-    qreal overshoot;
     QBasicTimer pressAndHoldTimer;
     QPointF lastPos;
     QPointF pressedPos;
+    QPointF zeroPos;
     QColor color;
     QColor highlightColor;
     QPointer<QQuickItem> countOwner;
@@ -125,9 +86,6 @@
     UCListItemDivider *divider;
     UCListItemActions *leadingActions;
     UCListItemActions *trailingActions;
-    UCActionPanel *leadingPanel;
-    UCActionPanel *trailingPanel;
-    ListItemAnimator animator;
     UCAction *mainAction;
 
     // FIXME move these to StyledItemBase togehther with subtheming.
@@ -136,9 +94,6 @@
     UCListItemStyle *styleItem;
 
     // getters/setters
-    qreal swipeOvershoot() const;
-    void setSwipeOvershoot(qreal overshoot);
-    void resetSwipeOvershoot();
     QQmlListProperty<QObject> data();
     QQmlListProperty<QQuickItem> children();
     bool contentMoving() const;
@@ -152,22 +107,6 @@
     void setAction(UCAction *action);
 };
 
-class UCListItemAttachedPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(UCListItemAttached)
-public:
-    UCListItemAttachedPrivate() : QObjectPrivate(), panel(0), listItem(0) {}
-
-    static UCListItemAttachedPrivate* get(UCListItemAttached *that)
-    {
-        return that->d_func();
-    }
-
-    UCActionPanel *panel;
-    UCListItem *listItem;
-    QList<UCAction*> visibleActions;
-};
-
 class PropertyChange;
 class UCViewItemsAttachedPrivate
 {
@@ -189,43 +128,6 @@
     QPointer<UCListItem> disablerItem;
 };
 
-class UCActionPanel : public QObject
-{
-    Q_OBJECT
-public:
-    ~UCActionPanel();
-    static bool grabPanel(UCActionPanel **panel, UCListItem *item, bool leading);
-    static void ungrabPanel(UCActionPanel *panel);
-    static bool isConnected(UCActionPanel *panel);
-
-    UCListItemActions *actions();
-    QQuickItem *panel() const;
-    UCListItem::PanelStatus panelStatus()
-    {
-        return status;
-    }
-    bool isLeading() const
-    {
-        return leading;
-    }
-
-Q_SIGNALS:
-    void statusChanged();
-
-private:
-    UCActionPanel(UCListItem *item, bool leading);
-    bool createPanel(QQmlComponent *panelDelegate);
-    UCListItemAttached *attachedObject();
-
-    UCListItem *listItem;
-    QQuickItem *panelItem;
-    UCListItem::PanelStatus status;
-    bool leading:1;
-    bool connected:1;
-};
-
 QColor getPaletteColor(const char *profile, const char *color);
 
-QML_DECLARE_TYPE(UCListItemDivider)
-
 #endif // UCVIEWITEM_P_H

=== modified file 'modules/Ubuntu/Components/plugin/uclistitemactions.cpp'
--- modules/Ubuntu/Components/plugin/uclistitemactions.cpp	2015-01-07 09:51:32 +0000
+++ modules/Ubuntu/Components/plugin/uclistitemactions.cpp	2015-02-19 08:31:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -158,7 +158,7 @@
  * \qmlproperty Component ListItemActions::delegate
  * The property holds the custom delegate to visualize the actions listed in the
  * ListItemActions. When set to null, the default delegate specified by the \l
- * {ListItemStyle::actionsDelegate}{actionsDelegate} will be used.
+ * ListItemStyle will be used.
  *
  * ListItemActions provides the \c action context property which contains the
  * Action instance currently visualized. Using this property delegates can access

=== removed file 'modules/Ubuntu/Components/plugin/uclistitemattached.cpp'
--- modules/Ubuntu/Components/plugin/uclistitemattached.cpp	2015-02-06 07:51:31 +0000
+++ modules/Ubuntu/Components/plugin/uclistitemattached.cpp	1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "uclistitem.h"
-#include "uclistitem_p.h"
-#include "uclistitemactions.h"
-#include "uclistitemactions_p.h"
-#include "ucunits.h"
-#include "ucaction.h"
-
-UCListItemAttached::UCListItemAttached(QObject *parent)
-    : QObject(*(new UCListItemAttachedPrivate()), parent)
-{
-}
-
-UCListItemAttached::~UCListItemAttached()
-{
-}
-
-void UCListItemAttached::setList(UCListItem *list, bool leading, bool visualizeActions)
-{
-    Q_D(UCListItemAttached);
-    if (d->listItem == list) {
-        return;
-    }
-    d->listItem = list;
-
-    if (visualizeActions) {
-        d->panel = leading ? UCListItemPrivate::get(d->listItem)->leadingPanel : UCListItemPrivate::get(d->listItem)->trailingPanel;
-    } else {
-        d->panel = 0;
-    }
-    if (d->panel) {
-        // connect statusChanged() to update status, listItem, listItemIndex and overshoot values
-        QObject::connect(d->panel, &UCActionPanel::statusChanged,
-                         this, &UCListItemAttached::panelStatusChanged);
-
-        // connect actions to get updates about visible changes
-        Q_FOREACH(UCAction *action, UCListItemActionsPrivate::get(d->panel->actions())->actions) {
-            QObject::connect(action, &UCAction::visibleChanged,
-                             this, &UCListItemAttached::updateVisibleActions);
-        }
-        updateVisibleActions();
-        Q_EMIT actionsChanged();
-        Q_EMIT visibleActionsChanged();
-    }
-}
-
-// private slot to update visible actions
-void UCListItemAttached::updateVisibleActions()
-{
-    Q_D(UCListItemAttached);
-    if (d->panel) {
-        d->visibleActions.clear();
-        Q_FOREACH(UCAction *action, UCListItemActionsPrivate::get(d->panel->actions())->actions) {
-            if (action->m_visible) {
-                d->visibleActions << action;
-            }
-        }
-        Q_EMIT visibleActionsChanged();
-    }
-}
-
-/*!
- * \qmlattachedproperty ListItemActions ListItem::actions
- * \readonly
- * The property holds the instance of the \l ListItemActions the ListItem's actions
- * panel is visualizing. The property holds a valid value only when attached to
- * the action visualizing panel defined in \l ListItemStyle::actionsDelegate style
- * property.
- */
-UCListItemActions *UCListItemAttached::actions() const
-{
-    Q_D(const UCListItemAttached);
-    return d->panel ? d->panel->actions() : 0;
-}
-
-/*!
- * \qmlattachedproperty list<Action> ListItem::visibleActions
- * Holds the list of visible actions. This is a convenience property to help action
- * visualization panel implementations to consider only visible actions. Similar to
- * \l actions attached property, it is only valid when attached to \l ListItemStyle::actionsDelegate
- * component.
- */
-QQmlListProperty<UCAction> UCListItemAttached::visibleActions()
-{
-    Q_D(UCListItemAttached);
-    return QQmlListProperty<UCAction>(this, d->visibleActions);
-}
-
-/*!
- * \qmlattachedproperty ListItem ListItem::item
- * \readonly
- * The property reports the connected \l ListItem to the panel. Valid in every attachee.
- */
-UCListItem *UCListItemAttached::item()
-{
-    Q_D(UCListItemAttached);
-    return d->listItem;
-}
-
-/*!
- * \qmlattachedproperty int ListItem::index
- * \readonly
- * Holds the index of the \l ListItem within a view, if the \l ListItem is used
- * in a model driven view, or the child index otherwise. Valid in every attachee.
- */
-int UCListItemAttached::index() {
-    Q_D(UCListItemAttached);
-    return d->listItem ? UCListItemPrivate::get(d->listItem)->index() : -1;
-}
-
-/*!
- * \qmlattachedproperty enum ListItem::panelStatus
- * \readonly
- * The property holds the status of the ListItemActions, whether is connected
- * as leading or as trailing action list to a \l ListItem. Possible valueas are:
- * \list A
- *  \li \b None - default, the actions list is not connected to any \l ListItem
- *  \li \b Leading - the actions list is connected as leading list
- *  \li \b Trailing - the actions list is connected as trailing list
- * \endlist
- * The property is valid only when attached to \l ListItemStyle::actionsDelegate component.
- */
-UCListItem::PanelStatus UCListItemAttached::panelStatus()
-{
-    Q_D(UCListItemAttached);
-    if (!d->panel) {
-        return UCListItem::None;
-    }
-    return d->panel->panelStatus();
-}
-
-/*!
- * \qmlattachedmethod void ListItem::snapToPosition(real position)
- * The function can be used to perform custom snapping, or to execute rebounding
- * and also disconnecting from the connected \l ListItem. This can be achieved by
- * calling the function with 0.0 value. The slot has effect only when used from
- * \l ListItemStyle::actionsDelegate component.
- */
-void UCListItemAttached::snapToPosition(qreal position)
-{
-    UCListItem::PanelStatus itemStatus = panelStatus();
-    Q_D(UCListItemAttached);
-    //if it is disconnected, leave (this also includes the case when m_container is null)
-    if (!d->listItem || !d->panel || itemStatus == UCListItem::None) {
-        return;
-    }
-    UCListItemPrivate *listItem = UCListItemPrivate::get(d->listItem);
-    position *= (itemStatus == UCListItem::Leading) ? 1 : -1;
-    listItem->animator.snap(position);
-}

=== modified file 'modules/Ubuntu/Components/plugin/uclistitemstyle.cpp'
--- modules/Ubuntu/Components/plugin/uclistitemstyle.cpp	2015-02-06 07:51:31 +0000
+++ modules/Ubuntu/Components/plugin/uclistitemstyle.cpp	2015-02-19 08:31:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,8 +15,12 @@
  */
 
 #include "uclistitemstyle.h"
+#include "i18n.h"
+#include "uclistitem.h"
 #include <QtQml/QQmlEngine>
-#include <QtQuick/private/qquickbehavior_p.h>
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlInfo>
+#include <QtQuick/private/qquickanimation_p.h>
 
 /*!
  * \qmltype ListItemStyle
@@ -29,46 +33,90 @@
  * Style API for the ListItem component which provides actions, select and
  * drag handler delegates, and snap animation via its properties.
  * ListItem treats the style differently compared to the other components,
- * as it:
- * \list
- *  \li - loads the style only when needed
- *  \li - gets delegates and snap animation from the style properties
- *  \li - ignores any other visuals defined in the style.
- * \endlist
+ * as it loads the style only when needed and not upon component creation.
  */
 UCListItemStyle::UCListItemStyle(QQuickItem *parent)
     : QQuickItem(parent)
-    , m_actionsDelegate(0)
-    , m_selectionDelegate(0)
-    , m_dragHandlerDelegate(0)
     , m_snapAnimation(0)
-    , m_swipeOvershoot(0)
-{
-}
-
-/*!
- * \qmlproperty Component ListItemStyle::actionsDelegate
- * Specifies the component visualizing the leading/trailing actions.
- */
-
-/*!
- * \qmlproperty Component ListItemStyle::selectionDelegate
- * Holds the component handling the selection mode.
- */
-
-/*!
- * \qmlproperty Component ListItemStyle::dragHandlerDelegate
- * Holds the component shown when dragging mode is enabled.
- */
+{
+}
+
+void UCListItemStyle::componentComplete()
+{
+    QQuickItem::componentComplete();
+
+    // look for overridden slots
+    for (int i = metaObject()->methodOffset(); i < metaObject()->methodCount(); i++) {
+        const QMetaMethod method = metaObject()->method(i);
+        if (method.name() == QByteArrayLiteral("swipeEvent")) {
+            m_swipeEvent = method;
+        } else if (method.name() == QByteArrayLiteral("rebound")) {
+            m_rebound = method;
+        }
+    }
+
+    // connect snapAnimation's stopped() and the owning ListItem's sontentMovementeEnded() signals
+    UCListItem *listItem = qmlContext(this)->contextProperty("styledItem").value<UCListItem*>();
+    if (listItem && m_snapAnimation) {
+        connect(m_snapAnimation, SIGNAL(runningChanged(bool)),
+                listItem, SLOT(_q_contentMoving()));
+    }
+}
+
+/*!
+ * \qmlmethod ListItemStyle::swipeEvent(SwipeEvent event)
+ * The function is called by the ListItem when a swipe action is performed, i.e.
+ * when the swipe is started, the position is updated or the swipe ends. The
+ * \b event object provides information about the swipe status, positions and
+ * the updated \l {ListItem::contentItem}{ListItem.contentItem} position. The
+ * style implementation can override the contentItem position by setting the
+ * \c event.content.x or \c event.content.y properties to the desired value.
+ *
+ * The \c event object properties are:
+ * \list
+ * \li * \c status - enumeration of \c {Started, Updated, Finished} values representing
+ *                  the swipe event status
+ * \li * \c to - (x, y) coordinates of the current mouse/touch point - read-only
+ * \li * \c from - (x, y) coordinates of the previous mouse/touch point - read-only
+ * \li * \c content - (x, y) updated coordinates of the \l {ListItem::contentItem}
+ *                  {ListItem.contentItem}, read-write
+ * \endlist
+ */
+void UCListItemStyle::swipeEvent(UCSwipeEvent *event)
+{
+    Q_UNUSED(event);
+    qmlInfo(this) << UbuntuI18n::instance().tr("consider overriding swipeEvent() slot!");
+}
+void UCListItemStyle::invokeSwipeEvent(UCSwipeEvent *event)
+{
+    if (m_swipeEvent.isValid()) {
+        m_swipeEvent.invoke(this, Q_ARG(QVariant, QVariant::fromValue(event)));
+    } else {
+        swipeEvent(event);
+    }
+}
+
+/*!
+ * \qmlmethod ListItemStyle::rebound()
+ * Function called by the ListItem when a rebounding action is requested from the
+ * style. This usually happens when the list item's content is swiped and there is
+ * a press event happening outside of the ListItem's boundary or when the view
+ * embedding the ListItem starts scrolling.
+ */
+void UCListItemStyle::rebound()
+{
+    qmlInfo(this) << UbuntuI18n::instance().tr("consider overriding rebound() slot!");
+}
+void UCListItemStyle::invokeRebound()
+{
+    if (m_rebound.isValid()) {
+        m_rebound.invoke(this);
+    } else {
+        rebound();
+    }
+}
 
 /*!
  * \qmlproperty Animation ListItemStyle::snapAnimation
- * Holds the behavior used in animating when snapped in or out. It can hold many
- * animations, and will be used in a Behavior on the \l ListItem::contentItem
- * \c x property.
- */
-
-/*!
- * \qmlproperty real ListItemStyle::swipeOvershoot
- * The property specifies the overshoot value of the ListItem.
+ * Holds the behavior used in animating when snapped in or out.
  */

=== modified file 'modules/Ubuntu/Components/plugin/uclistitemstyle.h'
--- modules/Ubuntu/Components/plugin/uclistitemstyle.h	2015-02-06 07:51:31 +0000
+++ modules/Ubuntu/Components/plugin/uclistitemstyle.h	2015-02-19 08:31:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,34 +18,73 @@
 
 #include <QtQuick/QQuickItem>
 
+class UCSwipeEvent : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QPointF to READ to)
+    Q_PROPERTY(QPointF from READ from)
+    Q_PROPERTY(QPointF content MEMBER m_contentPos)
+    Q_PROPERTY(Status status READ status)
+    Q_ENUMS(Status)
+public:
+    enum Status {
+        Started,
+        Updated,
+        Finished
+    };
+
+    UCSwipeEvent(const QPointF &mousePos, const QPointF &lastPos, const QPointF &contentPos, Status status)
+        : QObject(), m_mousePos(mousePos), m_lastPos(lastPos), m_contentPos(contentPos), m_status(status)
+    {
+    }
+
+    QPointF to() const
+    {
+        return m_mousePos;
+    }
+    QPointF from() const
+    {
+        return m_lastPos;
+    }
+    Status status() const
+    {
+        return m_status;
+    }
+
+    QPointF m_mousePos;
+    QPointF m_lastPos;
+    QPointF m_contentPos;
+    Status m_status;
+};
+
 class QQmlComponent;
 class QQuickAbstractAnimation;
 class QQuickBehavior;
 class UCListItemStyle : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlComponent *actionsDelegate MEMBER m_actionsDelegate NOTIFY actionsDelegateChanged)
-    Q_PROPERTY(QQmlComponent *selectionDelegate MEMBER m_selectionDelegate NOTIFY selectionDelegateChanged)
-    Q_PROPERTY(QQmlComponent *dragHandlerDelegate MEMBER m_dragHandlerDelegate NOTIFY dragHandlerDelegateChanged)
     Q_PROPERTY(QQuickAbstractAnimation *snapAnimation MEMBER m_snapAnimation NOTIFY snapAnimationChanged)
-    Q_PROPERTY(qreal swipeOvershoot MEMBER m_swipeOvershoot NOTIFY swipeOvershootChanged)
 public:
     explicit UCListItemStyle(QQuickItem *parent = 0);
 
+    void invokeSwipeEvent(UCSwipeEvent *event);
+    void invokeRebound();
+
 Q_SIGNALS:
-    void actionsDelegateChanged();
-    void selectionDelegateChanged();
-    void dragHandlerDelegateChanged();
     void snapAnimationChanged();
-    void swipeOvershootChanged();
+
+public Q_SLOTS:
+    void swipeEvent(UCSwipeEvent *event);
+    void rebound();
+
+protected:
+    void componentComplete();
 
 private:
-    QQmlComponent *m_actionsDelegate;
-    QQmlComponent *m_selectionDelegate;
-    QQmlComponent *m_dragHandlerDelegate;
+
+    QMetaMethod m_swipeEvent;
+    QMetaMethod m_rebound;
     QQuickAbstractAnimation *m_snapAnimation;
-    qreal m_swipeOvershoot;
-
     friend class UCListItemPrivate;
     friend class UCActionPanel;
     friend class ListItemAnimator;

=== modified file 'modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp'
--- modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2015-02-06 07:51:31 +0000
+++ modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2015-02-19 08:31:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,6 +19,7 @@
 #include "uclistitem.h"
 #include "uclistitem_p.h"
 #include "propertychange_p.h"
+#include "uclistitemstyle.h"
 #include <QtQuick/private/qquickflickable_p.h>
 
 /*
@@ -197,7 +198,8 @@
     Q_D(UCViewItemsAttached);
     if (d->boundItem) {
         // snap out before we unbind
-        UCListItemPrivate::get(d->boundItem)->animator.snap(0);
+
+        UCListItemPrivate::get(d->boundItem)->snapOut();
         d->boundItem.clear();
     }
     // clear binding list

=== modified file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	2015-02-06 09:09:07 +0000
+++ tests/resources/listitems/ListItemTest.qml	2015-02-19 08:31:57 +0000
@@ -69,17 +69,21 @@
     property list<Action> leadingArray: [
         Action {
             iconName: "delete"
+            onTriggered: print(iconName, "triggered", value)
         }
     ]
     property list<Action> trailingArray: [
         Action {
             iconName: "search"
+            onTriggered: print(iconName, "triggered", value)
         },
         Action {
             iconName: "edit"
+            onTriggered: print(iconName, "triggered", value)
         },
         Action {
             iconName: "email"
+            onTriggered: print(iconName, "triggered", value)
         }
     ]
 
@@ -162,8 +166,12 @@
                 id: listItem
                 onClicked: print(" clicked")
                 onPressAndHold: print("pressAndHold")
-                leadingActions: leading
-                trailingActions: leadingActions
+                leadingActions: ListItemActions {
+                    actions: trailingArray
+                }
+
+                trailingActions: trailing
+                contentItem.anchors.margins: units.gu(1)
 
                 Label {
                     anchors.fill: parent
@@ -172,8 +180,6 @@
                           "The second line - item #" + modelData
                 }
 
-                onContentMovementEnded: print('end')
-
                 states: State {
                     name: "override"
                     when: main.override
@@ -182,6 +188,9 @@
                         highlightColor: "brown"
                     }
                 }
+
+                onContentMovementStarted: print("moving started")
+                onContentMovementEnded: print("moving ended")
             }
         }
         Flickable {
@@ -207,7 +216,6 @@
                         color: UbuntuColors.red
                         highlightColor: "lime"
                         divider.colorFrom: UbuntuColors.green
-                        swipeOvershoot: units.gu(10)
 
                         leadingActions: ListItemActions {
                             actions: leadingArray

=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
--- tests/unit_x11/tst_components/tst_listitem.qml	2015-02-18 15:39:38 +0000
+++ tests/unit_x11/tst_components/tst_listitem.qml	2015-02-19 08:31:57 +0000
@@ -137,6 +137,7 @@
     }
 
     UbuntuTestCase {
+        id: testCase
         name: "ListItemAPI"
         when: windowShown
 
@@ -175,10 +176,7 @@
             }
 
             if (watchTarget.contentItem.x != watchTarget.contentItem.anchors.leftMargin) {
-                movingSpy.target = watchTarget;
-                movingSpy.clear();
                 mouseClick(item, centerOf(item).x, centerOf(item).y);
-                movingSpy.wait();
                 tryCompareFunction(function() {
                     return watchTarget.contentItem.x == watchTarget.contentItem.anchors.leftMargin;
                 }, true, 500);
@@ -209,6 +207,8 @@
             interactiveSpy.clear();
             trailing.delegate = null;
             listView.positionViewAtBeginning();
+            // keep additional timeout for proper cleanup
+            wait(200);
         }
 
         function test_0_defaults() {
@@ -216,15 +216,16 @@
             compare(defaults.color, "#000000", "Transparent by default");
             compare(defaults.highlightColor, Theme.palette.selected.background, "Theme.palette.selected.background color by default")
             compare(defaults.highlighted, false, "Not highlighted by default");
-            compare(defaults.swipeOvershoot, 0.0, "No overshoot till the style is loaded!");
             compare(defaults.divider.visible, true, "divider is visible by default");
             compare(defaults.divider.anchors.leftMargin, 0, "divider's left margin is 0");
             compare(defaults.divider.anchors.rightMargin, 0, "divider's right margin is 0");
+            compare(defaults.divider.anchors.left, defaults.left, "divider's left anchor is wrong");
+            compare(defaults.divider.anchors.right, defaults.right, "divider's right anchor is wrong");
+            compare(defaults.divider.height, units.dp(2), "divider's thickness is wrong");
             compare(defaults.divider.colorFrom, "#000000", "colorFrom differs.");
             fuzzyCompare(defaults.divider.colorFrom.a, 0.14, 0.01, "colorFrom alpha differs");
             compare(defaults.divider.colorTo, "#ffffff", "colorTo differs.");
             fuzzyCompare(defaults.divider.colorTo.a, 0.07, 0.01, "colorTo alpha differs");
-            compare(defaults.contentMoving, false, "default is not moving");
             compare(defaults.action, null, "No action by default.");
             compare(defaults.style, null, "Style is loaded upon first use.");
             compare(defaults.__styleInstance, null, "__styleInstance must be null.");
@@ -303,38 +304,39 @@
             movingSpy.wait();
         }
 
-        function test_vertical_listview_move_cancels_highlight_mouse() {
-            var listItem = findChild(listView, "listItem0");
-            verify(listItem, "Cannot find listItem0");
-
-            // convert positions and use the listView to move
-            var pos = listView.mapFromItem(listItem, listItem.width / 2, 0);
-            highlightedSpy.target = listItem;
-            flick(listView, pos.x, pos.y, 0, units.gu(10), -1, undefined, undefined, undefined, 100);
-            highlightedSpy.wait();
-            // the highglighted should have been changed twice
-            compare(highlightedSpy.count, 2, "highlighted did not change twice");
-            compare(listItem.highlighted, false, "Itemshoudl not be highlighted");
+        function test_vertical_listview_move_cancels_highlight_data() {
+            return [
+                {tag: "With touch", mouse: false},
+                {tag: "With mouse", mouse: true},
+            ];
         }
-        function test_vertical_listview_move_cancels_highlight_touch() {
+        function test_vertical_listview_move_cancels_highlight(data) {
             var listItem = findChild(listView, "listItem0");
             verify(listItem, "Cannot find listItem0");
 
             // convert positions and use the listView to move
             var pos = listView.mapFromItem(listItem, listItem.width / 2, 0);
-            highlightedSpy.target = listItem;
-            TestExtras.touchPress(0, listView, pos);
-            for (var i = 1; i <= 5; i++) {
-                pos.y += i * units.gu(2);
-                TestExtras.touchMove(0, listView, pos);
-                // wait few milliseconds between moves
-                wait(100);
+            if (data.mouse) {
+                // provide slow move
+                mousePress(listView, pos.x, pos.y);
+                for (var i = 1; i < 4; i++) {
+                    pos.y += i * units.gu(0.5);
+                    mouseMove(listView, pos.x, pos.y, 100);
+                }
+                compare(listItem.highlighted, false, "highlighted still!");
+                mouseRelease(listView, pos.x, pos.y, undefined, undefined, 100);
+            } else {
+                // convert pos to point otherwise touch functions will get (0,0) points!!!
+                var pt = Qt.point(pos.x, pos.y);
+                TestExtras.touchPress(0, listView, pt);
+                for (i = 1; i < 4; i++) {
+                    pt.y += i * units.gu(0.5);
+                    TestExtras.touchMove(0, listView, pt);
+                    wait(100);
+                }
+                compare(listItem.highlighted, false, "highlighted still!");
+                TestExtras.touchRelease(0, listView, pt);
             }
-            TestExtras.touchRelease(0, listView, pos);
-            highlightedSpy.wait();
-            // the highglighted should have been changed twice
-            compare(highlightedSpy.count, 2, "highlighted did not change twice");
-            compare(listItem.highlighted, false, "Itemshoudl not be highlighted");
         }
 
         function test_background_height_change_on_divider_visible() {
@@ -559,7 +561,7 @@
             return [
                 // the first dx must be big enough to drag the panel in, it is always the last dx value
                 // which decides the snap direction
-                {tag: "Snap out, leading", item: listItem, grabPos: front, dx: [units.gu(10), -units.gu(2)], snapIn: false},
+                {tag: "Snap out, leading", item: listItem, grabPos: front, dx: [units.gu(10), -units.gu(3)], snapIn: false},
                 {tag: "Snap in, leading", item: listItem, grabPos: front, dx: [units.gu(10), -units.gu(1), units.gu(1.5)], snapIn: true},
                 // have less first dx as the trailing panel is shorter
                 {tag: "Snap out, trailing", item: listItem, grabPos: rear, dx: [-units.gu(5), units.gu(2)], snapIn: false},
@@ -570,13 +572,13 @@
             // performe the moves
             movingSpy.target = data.item;
             var pos = data.grabPos;
-            mousePress(data.item.contentItem, pos.x, pos.y);
+            mousePress(data.item, pos.x, pos.y);
             for (var i in data.dx) {
                 var dx = data.dx[i];
-                mouseMoveSlowly(data.item.contentItem, pos.x, pos.y, dx, 0, 5, 100);
-                pos.x += dx;
+                mouseMoveSlowly(data.item, pos.x, pos.y, data.dx[i], 0, 5, 100);
+                pos.x += data.dx[i];
             }
-            mouseRelease(data.item.contentItem, pos.x, pos.y);
+            mouseRelease(data.item, pos.x, pos.y);
             movingSpy.wait();
 
             if (data.snapIn) {
@@ -589,52 +591,8 @@
             }
         }
 
-        // execute thes overshoot tests early enough to make sure that style is not loaded yet
-        function test_1_overshoot_from_style() {
-            // scroll to the last ListView element and test on that, to make sure we don't have the style loaded for that component
-            listView.positionViewAtEnd();
-            var listItem = findChild(listView, "listItem" + (listView.count - 4));
-            verify(listItem, "Cannot get list item for testing");
-
-            compare(listItem.swipeOvershoot, 0.0, "No overshoot should be set yet!");
-            // now swipe
-            movingSpy.target = listItem;
-            flick(listItem.contentItem, centerOf(listItem).x, centerOf(listItem).y, units.gu(5), 0);
-            movingSpy.wait();
-            compare(listItem.swipeOvershoot, listItem.__styleInstance.swipeOvershoot, "Overshoot not taken from style");
-
-            // cleanup
-            rebound(listItem);
-        }
-
-        function test_2_custom_overshoot_data() {
-            // use different items to make sure the style doesn't update the overshoot values during the test
-            return [
-                {tag: "Positive value", index: listView.count - 1, value: units.gu(10), expected: units.gu(10)},
-                {tag: "Zero value", index: listView.count - 2, value: 0, expected: 0},
-                // synchronize the expected value with the one from Ambiance theme!
-                {tag: "Negative value", index: listView.count - 3, value: -1, expected: units.gu(2)},
-            ];
-        }
-        function test_2_custom_overshoot(data) {
-            // scroll to the last ListView element and test on that, to make sure we don't have the style loaded for that component
-            listView.positionViewAtEnd();
-            var listItem = findChild(listView, "listItem" + data.index);
-            verify(listItem, "Cannot get list item for testing");
-
-            compare(listItem.swipeOvershoot, 0.0, "No overshoot should be set yet!");
-            listItem.swipeOvershoot = data.value;
-            // now swipe
-            movingSpy.target = listItem;
-            flick(listItem.contentItem, centerOf(listItem).x, centerOf(listItem).y, units.gu(5), 0);
-            movingSpy.wait();
-            compare(listItem.swipeOvershoot, data.expected, "Overshoot differs from one set!");
-
-            // cleanup
-            rebound(listItem);
-        }
-
         function test_verify_action_value_data() {
+            listView.positionViewAtBeginning();
             var item0 = findChild(listView, "listItem0");
             var item1 = findChild(listView, "listItem1");
             var item2 = findChild(listView, "listItem2");
@@ -644,8 +602,6 @@
                 {tag: "Standalone item, child index 3", item: testItem, result: 3},
                 {tag: "ListView, item index 0", item: item0, result: 0},
                 {tag: "ListView, item index 1", item: item1, result: 1},
-                {tag: "ListView, item index 2", item: item2, result: 2},
-                {tag: "ListView, item index 3", item: item3, result: 3},
             ];
         }
         function test_verify_action_value(data) {
@@ -662,7 +618,9 @@
             actionSpy.target = data.item.leadingActions.actions[1];
 
             // select the action
+            movingSpy.clear();
             mouseClick(action, centerOf(action).x, centerOf(action).y);
+            movingSpy.wait();
 
             // check the action param
             actionSpy.wait();