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

[Albert Astals Cid]

LVWPH: Reset to initial values when list is 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

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2173
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/285/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/285/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2173
http://jenkins.qa.ubuntu.com/job/unity8-ci/7227/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6366
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/642/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1932
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/635
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/634
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/633
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6377
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6377/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27364
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/337/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/640
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/640/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27365

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
yes, bug seems fixed
 * Did CI run pass? If not, please explain why.
lazyimage
 * Did you make sure that the branch does not contain spurious tags?
yes, clean

review: Approve

=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
--- plugins/Dash/listviewwithpageheader.cpp	2016-01-05 09:24:58 +0000
+++ plugins/Dash/listviewwithpageheader.cpp	2016-02-05 14:58:38 +0000
@@ -219,13 +219,7 @@
         Q_FOREACH(ListItem *item, m_visibleItems)
             releaseItem(item);
         m_visibleItems.clear();
-        m_firstVisibleIndex = -1;
-        adjustMinYExtent();
-        setContentY(0);
-        m_clipItem->setY(0);
-        if (m_topSectionItem) {
-            QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
-        }
+        initializeValuesForEmptyList();
 
         m_delegateModel->setDelegate(delegate);
 
@@ -236,6 +230,17 @@
     }
 }
 
+void ListViewWithPageHeader::initializeValuesForEmptyList()
+{
+    m_firstVisibleIndex = -1;
+    adjustMinYExtent();
+    setContentY(0);
+    m_clipItem->setY(0);
+    if (m_topSectionItem) {
+        QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
+    }
+}
+
 QQuickItem *ListViewWithPageHeader::header() const
 {
     return m_headerItem;
@@ -835,7 +840,7 @@
         }
     }
     if (!foundVisible) {
-        m_firstVisibleIndex = -1;
+        initializeValuesForEmptyList();
     }
     if (m_firstVisibleIndex != oldFirstVisibleIndex) {
         adjustMinYExtent();
@@ -1092,7 +1097,11 @@
     }
 
     if (m_firstVisibleIndex != oldFirstVisibleIndex) {
-        adjustMinYExtent();
+        if (m_visibleItems.isEmpty()) {
+            initializeValuesForEmptyList();
+        } else {
+            adjustMinYExtent();
+        }
     }
 
     for (int i = 0; i < m_visibleItems.count(); ++i) {

=== modified file 'plugins/Dash/listviewwithpageheader.h'
--- plugins/Dash/listviewwithpageheader.h	2015-11-26 13:50:56 +0000
+++ plugins/Dash/listviewwithpageheader.h	2016-02-05 14:58:38 +0000
@@ -168,6 +168,7 @@
     QQuickItem *getSectionItem(int modelIndex, bool alreadyInserted);
     QQuickItem *getSectionItem(const QString &sectionText);
     void updateSectionItem(int modelIndex);
+    void initializeValuesForEmptyList();
 
     QQmlDelegateModel *m_delegateModel;
 

=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.cpp'
--- tests/plugins/Dash/listviewwithpageheadertest.cpp	2015-09-02 08:04:41 +0000
+++ tests/plugins/Dash/listviewwithpageheadertest.cpp	2016-02-05 14:58:38 +0000
@@ -1954,6 +1954,29 @@
         QCOMPARE(lvwph->m_firstVisibleIndex, 0);
     }
 
+    void testBug1540490()
+    {
+        lvwph->header()->setImplicitHeight(150);
+        verifyItem(0, 150., 150., false);
+
+        QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 3), Q_ARG(QVariant, 3));
+        model->setProperty(0, "size", 400);
+        model->setProperty(1, "size", 600);
+        model->setProperty(2, "size", 300);
+
+        scrollToBottom();
+        changeContentY(-200);
+
+        QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 2));
+        model->setProperty(0, "size", 100);
+        QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 1));
+        lvwph->header()->setImplicitHeight(50);
+        QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 200));
+
+        QTRY_COMPARE(lvwph->m_visibleItems.count(), 1);
+        verifyItem(0, 50., 200., false);
+    }
+
 private:
     QQuickView *view;
     ListViewWithPageHeader *lvwph;

=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.qml'
--- tests/plugins/Dash/listviewwithpageheadertest.qml	2015-07-15 15:07:19 +0000
+++ tests/plugins/Dash/listviewwithpageheadertest.qml	2016-02-05 14:58:38 +0000
@@ -85,7 +85,6 @@
         pageHeader: Rectangle {
             color: "transparent"
             width: parent.width
-            height: 50
             implicitHeight: 50
             Text {
                 anchors.fill: parent