Merge lp:~renatofilho/address-book-app/fix-1585791 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Propagate mouse click on ListItemWithActions.

[lp:~renatofilho/address-book-app/fix-1585791]

591. By Renato Araujo Oliveira Filho on 2016-05-25

Upate tests.

592. By Renato Araujo Oliveira Filho on 2016-05-26

Propagate events from checkbox to list item.

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
--- src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2016-05-17 16:25:50 +0000
+++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2016-05-26 18:52:30 +0000
@@ -257,8 +257,6 @@
         id: main
         objectName: "mainItem"
 
-        // make sure that this item is behind the mouse area
-        z: -1
         anchors {
             top: parent.top
             bottom: parent.bottom
@@ -273,6 +271,7 @@
 
         Loader {
             id: selectionIcon
+            objectName: "selectionIcon"
 
             anchors {
                 left: main.left
@@ -394,6 +393,7 @@
         property real lastX: -1
 
         anchors.fill: parent
+        z: -1
         drag {
             target: locked ? null : main
             axis: Drag.XAxis
@@ -474,6 +474,5 @@
                 root.itemPressAndHold(mouse)
             }
         }
-        z: -1
     }
 }

=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml'
--- src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml	2016-05-26 18:52:30 +0000
@@ -18,8 +18,20 @@
 import Ubuntu.Components 1.3
 
 CheckBox {
-    checked: root.selected
+    id: checkBoxk
+    objectName: "listItemWithActionsCheckBox"
     width: implicitWidth
     // disable item mouse area to avoid conflicts with parent mouse area
-    __mouseArea.enabled: false
+    __mouseArea {
+        propagateComposedEvents: true
+        onClicked: {
+            mouse.accepted = false
+        }
+    }
+
+    Binding {
+        target: checkBoxk
+        property: "checked"
+        value: root.selected
+    }
 }

=== modified file 'tests/qml/tst_ListWithActions.qml'
--- tests/qml/tst_ListWithActions.qml	2015-10-26 13:18:11 +0000
+++ tests/qml/tst_ListWithActions.qml	2016-05-26 18:52:30 +0000
@@ -52,12 +52,14 @@
                     id: listWithActions
                     objectName: "listWithActions" + index
 
+
                     anchors {
                         left: parent.left
                         right: parent.right
                     }
                     height: units.gu(8)
                     triggerActionOnMouseRelease: true
+
                     Rectangle {
                         anchors.fill: parent
                         color: "green"
@@ -217,6 +219,45 @@
                 }
             }
 
+            ListItemWithActions {
+                id: itemWithMouseArea
+                objectName: "itemWithMouseArea"
+
+                property int clickCount: 0
+
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                Rectangle {
+                    anchors.fill: parent
+                    color: "black"
+
+                    MouseArea {
+                        objectName: "itemMouseArea"
+                        anchors {
+                            left: parent.left
+                            top: parent.top
+                            bottom: parent.bottom
+                        }
+                        width: units.gu(6)
+                        onClicked: {
+                            itemWithMouseArea.clickCount++
+                        }
+                    }
+                }
+
+                onItemPressAndHold: {
+                    selectionMode = true
+                }
+                onItemClicked: {
+                    if (selectionMode) {
+                        selected = !selected
+                    }
+                }
+            }
+
         }
     }
 
@@ -445,5 +486,34 @@
             mouseRelease(itemData.item, finalX, itemData.y)
             tryCompare(itemData.item, "swipeState", "Normal")
         }
+
+        function test_enterSelectionMode()
+        {
+            var item = findChild(itemList, "itemWithMouseArea")
+            mousePress(item, item.width / 2, item.height / 2, Qt.LeftButton, Qt.NoModifier, 3000)
+            tryCompare(item, "selectionMode", true)
+        }
+
+
+        function test_selectAnItem()
+        {
+            var item = findChild(itemList, "itemWithMouseArea")
+            mousePress(item, item.width / 2, item.height / 2, Qt.LeftButton, Qt.NoModifier, 2000)
+            tryCompare(item, "selectionMode", true)
+
+            var checkBox = findChild(item, "selectionIcon")
+            // wait checkbox to be fully visible
+            mouseClick(checkBox)
+            tryCompare(item, "selected", true)
+        }
+
+        function test_clickInsideOfAnItem()
+        {
+            var item = findChild(itemList, "itemWithMouseArea")
+            waitForRendering(item)
+            var mouseArea = findChild(item, "itemMouseArea")
+            mouseClick(mouseArea, mouseArea.width / 2, mouseArea.height /2)
+            tryCompare(item, "clickCount", 1)
+        }
     }
 }