Merge lp:~aacid/unity8/lvwph_firstVisibleIndex_remove into lp:unity8

[Albert Astals Cid]

Make sure m_firstVisibleIndex is correctly set after processing changeSet.removes

There are two fixes:
* Decouple the code that sets the m_firstVisibleIndex that was only done when !growDown
* Set m_firstVisibleIndex correctly when the list is not empty

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

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1661
http://jenkins.qa.ubuntu.com/job/unity8-ci/5444/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1811
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/608
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/609
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1600
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1809
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1809/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18913

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

No. :( Qmltest failures are not related to this branch. It's a bit odd that this branch seems to have failed all AP tests. I've triggered a rebuild now, but I think there's some general mir restarting instability going on atm.

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1661
http://jenkins.qa.ubuntu.com/job/unity8-ci/5447/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1833
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/612
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1621
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1831
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1831/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18954

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1661
http://jenkins.qa.ubuntu.com/job/unity8-ci/5449/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1846
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/613
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/614
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/614
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1844
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1844/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18974

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
--- plugins/Dash/listviewwithpageheader.cpp	2014-12-03 10:28:53 +0000
+++ plugins/Dash/listviewwithpageheader.cpp	2015-03-17 16:03:51 +0000
@@ -973,14 +973,13 @@
             }
             if (growDown) {
                 adjustMinYExtent();
-            } else if (remove.index <= m_firstVisibleIndex) {
-                if (!m_visibleItems.isEmpty()) {
-                    // We removed the first item that is the one that positions the rest
-                    // position the new first item correctly
-                    m_visibleItems.first()->setY(oldFirstValidIndexPos);
-                } else {
-                    m_firstVisibleIndex = -1;
-                }
+            } else if (remove.index <= m_firstVisibleIndex && !m_visibleItems.isEmpty()) {
+                m_visibleItems.first()->setY(oldFirstValidIndexPos);
+            }
+            if (m_visibleItems.isEmpty()) {
+                m_firstVisibleIndex = -1;
+            } else {
+                m_firstVisibleIndex -= qMax(0, m_firstVisibleIndex - remove.index);
             }
         } else if (remove.index + remove.count <= m_firstVisibleIndex) {
             m_firstVisibleIndex -= remove.count;

=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.cpp'
--- tests/plugins/Dash/listviewwithpageheadertest.cpp	2014-12-03 11:06:10 +0000
+++ tests/plugins/Dash/listviewwithpageheadertest.cpp	2015-03-17 16:03:51 +0000
@@ -1938,6 +1938,17 @@
         QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
     }
 
+    void testFirstVisibleIndexRemove()
+    {
+        changeContentY(520);
+        QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);
+        QCOMPARE(lvwph->m_firstVisibleIndex, 1);
+
+        // Remove 0 and 1, the previously visible index 2 will be 0 and visible
+        QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 2));
+        QCOMPARE(lvwph->m_firstVisibleIndex, 0);
+    }
+
 private:
     QQuickView *view;
     ListViewWithPageHeader *lvwph;