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

[Albert Astals Cid]

Misc journal fixes

Don't init *modelIndex to INT_MAX
  Makes no sense since we're not doing any qMin and the calling function also accepts any index >= 0 as valid
  so in some cases it may end up wanting to create an index that doesn't exist

Don't refill if height() < 0, that gives bad ranges for from/to and the code gets confused

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:640
http://jenkins.qa.ubuntu.com/job/unity8-ci/2070/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2238
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/922
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/594
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/594/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2075
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2367
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2367/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2238
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4695
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3121

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

review: Needs Fixing (continuous-integration)

[Michał Karnicki (karni)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:640
http://jenkins.qa.ubuntu.com/job/unity8-ci/2085/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/942
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/607
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/609
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/609/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/607
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2099
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2395
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2395/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2264
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2264/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4715
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3144

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Can we test this?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:641
http://jenkins.qa.ubuntu.com/job/unity8-ci/2097/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2426
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/955
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/621
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/621/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2428
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2428/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2282
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4728
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3164

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

review: Approve (continuous-integration)

[Michał Karnicki (karni)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/949/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3912
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/962
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/335
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/335/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/335
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2448
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2296
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2296/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4742
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3180

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/unity8-autolanding/950/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3918
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2304
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/963
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/336
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/336/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/336
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2463
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2463/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2304
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2304/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4750
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3195

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/DashViews/abstractjournal.cpp'
--- plugins/DashViews/abstractjournal.cpp	2014-01-07 14:51:15 +0000
+++ plugins/DashViews/abstractjournal.cpp	2014-01-17 10:09:05 +0000
@@ -194,7 +194,7 @@
 
 void AbstractJournal::refill()
 {
-    if (!isComponentComplete()) {
+    if (!isComponentComplete() || height() < 0) {
         return;
     }
 

=== modified file 'plugins/DashViews/horizontaljournal.cpp'
--- plugins/DashViews/horizontaljournal.cpp	2014-01-09 17:14:47 +0000
+++ plugins/DashViews/horizontaljournal.cpp	2014-01-17 10:09:05 +0000
@@ -173,6 +173,7 @@
     m_visibleItems.clear();
     m_lastInRowIndexPosition.clear();
     m_firstVisibleIndex = -1;
+    setImplicitHeightDirty();
 }
 
 void HorizontalJournal::calculateImplicitHeight()

=== modified file 'plugins/DashViews/verticaljournal.cpp'
--- plugins/DashViews/verticaljournal.cpp	2014-01-03 09:18:24 +0000
+++ plugins/DashViews/verticaljournal.cpp	2014-01-17 10:09:05 +0000
@@ -79,7 +79,7 @@
 
 void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)
 {
-    *modelIndex = INT_MAX;
+    *modelIndex = 0;
     *yPos = std::numeric_limits<qreal>::lowest();
     int columnToAddTo = -1;
 
@@ -179,6 +179,7 @@
         column.clear();
     }
     m_indexColumnMap.clear();
+    setImplicitHeightDirty();
 }
 
 void VerticalJournal::calculateImplicitHeight()

=== modified file 'tests/plugins/DashViews/horizontaljournaltest.cpp'
--- tests/plugins/DashViews/horizontaljournaltest.cpp	2014-01-03 08:37:09 +0000
+++ tests/plugins/DashViews/horizontaljournaltest.cpp	2014-01-17 10:09:05 +0000
@@ -126,9 +126,9 @@
         view->engine()->addImportPath(BUILT_PLUGINS_DIR);
 
         model = new WidthModel();
-        QStringList heightList;
-        heightList << "100" << "50" << "125" << "10" << "40" << "70" << "200" << "110" << "160" << "20" << "20" << "65" << "80" << "200" << "300" << "130" << "400" << "300" << "500" << "10";
-        model->setStringList(heightList);
+        QStringList widthList;
+        widthList << "100" << "50" << "125" << "10" << "40" << "70" << "200" << "110" << "160" << "20" << "20" << "65" << "80" << "200" << "300" << "130" << "400" << "300" << "500" << "10";
+        model->setStringList(widthList);
 
         view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/horizontaljournaltest.qml"));
 
@@ -336,9 +336,9 @@
 
     void testModelReset()
     {
-        QStringList heightList;
-        heightList << "100" << "50" << "125" << "25" << "50" << "50";
-        model->setStringList(heightList);
+        QStringList widthList;
+        widthList << "100" << "50" << "125" << "25" << "50" << "50";
+        model->setStringList(widthList);
 
         QTRY_COMPARE(hj->m_firstVisibleIndex, 0);
         QTRY_COMPARE(hj->m_visibleItems.count(), 6);
@@ -386,9 +386,9 @@
     void testModelAppendRemoveLast()
     {
         WidthModel *model2 = new WidthModel();
-        QStringList heightList;
-        heightList << "100" << "50" << "125" << "25" << "50" << "50";
-        model2->setStringList(heightList);
+        QStringList widthList;
+        widthList << "100" << "50" << "125" << "25" << "50" << "50";
+        model2->setStringList(widthList);
         hj->setModel(model2);
         delete model;
         model = model2;
@@ -454,6 +454,32 @@
         QCOMPARE(hj->implicitHeight(), 310.);
     }
 
+    void testNegativeHeight()
+    {
+        QQuickItemPrivate::get(hj)->anchors()->resetFill();
+        hj->setHeight(-8);
+
+        QStringList widthList;
+        widthList << "100" << "50" << "125" << "25" << "50" << "50";
+        model->setStringList(widthList);
+
+        QTRY_COMPARE(hj->m_visibleItems.count(), 0);
+        QTRY_COMPARE(hj->implicitHeight(), 0.);
+    }
+
+    void testNegativeDelegateCreationRange()
+    {
+        hj->setDelegateCreationBegin(0);
+        hj->setDelegateCreationEnd(-100);
+
+        QStringList widthList;
+        widthList << "100" << "50" << "50" << "30";
+        model->setStringList(widthList);
+
+        QTRY_COMPARE(hj->m_visibleItems.count(), 0);
+        QTRY_COMPARE(hj->implicitHeight(), 0.);
+    }
+
 private:
     QQuickView *view;
     HorizontalJournal *hj;

=== modified file 'tests/plugins/DashViews/verticaljournaltest.cpp'
--- tests/plugins/DashViews/verticaljournaltest.cpp	2014-01-03 08:37:09 +0000
+++ tests/plugins/DashViews/verticaljournaltest.cpp	2014-01-17 10:09:05 +0000
@@ -459,6 +459,38 @@
         verifyItem(vj->m_columnVisibleItems[1][2],  7, 160, 120, true);
     }
 
+    void testNegativeHeight()
+    {
+        QQuickItemPrivate::get(vj)->anchors()->resetFill();
+        vj->setHeight(-8);
+
+        QStringList heightList;
+        heightList << "100" << "50" << "50" << "30";
+        model->setStringList(heightList);
+
+        QTRY_COMPARE(vj->m_columnVisibleItems.count(), 3);
+        QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 0);
+        QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 0);
+        QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 0);
+        QTRY_COMPARE(vj->implicitHeight(), 0.);
+    }
+
+    void testNegativeDelegateCreationRange()
+    {
+        vj->setDelegateCreationBegin(0);
+        vj->setDelegateCreationEnd(-100);
+
+        QStringList heightList;
+        heightList << "100" << "50" << "50" << "30";
+        model->setStringList(heightList);
+
+        QTRY_COMPARE(vj->m_columnVisibleItems.count(), 3);
+        QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 0);
+        QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 0);
+        QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 0);
+        QTRY_COMPARE(vj->implicitHeight(), 0.);
+    }
+
 private:
     QQuickView *view;
     VerticalJournal *vj;