Merge lp:~mzanetti/ubuntu-ui-toolkit/fix-collapseOnClick-with-ubuntulistview into lp:ubuntu-ui-toolkit

[Michael Zanetti]

fix collapseOnClick in combination with UbuntuListView

* Are there any related MPs required for this MP to build/function as expected? Please list.

N/A

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

Yes.

* Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

Yes.

* Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ui-toolkit) on device or emulator?

No. Waiting for Ci@home.

* If you changed the UI, was the change specified/approved by design?

N/A

* If you changed the packaging (debian), did you subscribe a core-dev to this MP?

N/A

[lp:~mzanetti/ubuntu-ui-toolkit/fix-collapseOnClick-with-ubuntulistview]

978. By Michael Zanetti on 2014-03-17

added a test for the fix

[Martin Kaistra (djfun)]

fixes the problems in http://paste.ubuntu.com/7109005/ for me

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:978
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1904/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3987
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3572
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/852
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/852
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/852/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4022
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4022/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3574
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3574/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5906
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4863

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1904/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Seems to be doing the job! Thanks!

review: Approve

=== modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml'
--- modules/Ubuntu/Components/ListItems/Expandable.qml	2014-02-26 09:46:30 +0000
+++ modules/Ubuntu/Components/ListItems/Expandable.qml	2014-03-17 16:43:33 +0000
@@ -212,6 +212,12 @@
         anchors { left: parent.left; top: parent.top; right: parent.right }
         enabled: root.collapseOnClick && root.expanded
         height: root.collapsedHeight
-        onClicked: root.expanded = false;
+        onClicked: {
+            if (priv.isInExpandableListView) {
+                priv.view.expandedIndex = -1;
+            } else {
+                root.expanded = false;
+            }
+        }
     }
 }

=== modified file 'tests/unit_x11/tst_components/tst_ubuntulistview.qml'
--- tests/unit_x11/tst_components/tst_ubuntulistview.qml	2014-03-05 16:58:40 +0000
+++ tests/unit_x11/tst_components/tst_ubuntulistview.qml	2014-03-17 16:43:33 +0000
@@ -189,6 +189,20 @@
             
         }
 
+        function test_collapseOnClick() {
+            var item = findChild(ubuntuListView, "expandable1");
+            item.collapseOnClick = true;
+            expandItem(item);
+
+            compare(ubuntuListView.expandedIndex, 1);
+
+            mouseClick(item, item.width / 2, item.collapsedHeight / 2);
+            tryCompare(ubuntuListView, "expandedIndex", -1);
+
+            // restore stuff we've changed
+            item.collapseOnClick = false;
+        }
+
         function cleanup() {
             // Restore listview height
             ubuntuListView.height = units.gu(60);