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

[Albert Astals Cid]

Rework how we set the ranges so we get some more asynchronousity from item views

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

 * Did you perform an exploratory manual test run of your code change and any related functionality?
A few, still have to do more

 * 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:1391
http://jenkins.qa.ubuntu.com/job/unity8-ci/4879/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/143/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/44
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/136/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/143
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15733

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/moreAsyncDash]

1392. By Albert Astals Cid on 2014-11-17

Merge lp:~aacid/unity8/photoscopeimprovements

1393. By Albert Astals Cid on 2014-11-17

Remove unused static

1394. By Albert Astals Cid on 2014-11-17

Set cache buffer to the value it had when the test was written

1395. By Albert Astals Cid on 2014-11-17

Repair the cachebuffer here too

1396. By Albert Astals Cid on 2014-11-17

Fix more tests

1397. By Albert Astals Cid on 2014-11-17

Make test pass

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1391
http://jenkins.qa.ubuntu.com/job/unity8-ci/4909/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/227
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/227/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15875

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1397
http://jenkins.qa.ubuntu.com/job/unity8-ci/4922/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/87
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/244
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15900

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/moreAsyncDash]

1398. By Albert Astals Cid on 2014-11-19

Fix infinite loop in creation/deletion of delegates

There's two fixes actually:
 * One fix the calculation of visibleRange
 * Two make sure the displayMargins don't cross the wrong way (too much) otherwise GridView gets all confused and starts the infinite creation/destruction

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1398
http://jenkins.qa.ubuntu.com/job/unity8-ci/4931/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/253
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/279
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/279/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16005

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

review: Approve (continuous-integration)

[lp:~aacid/unity8/moreAsyncDash]

1399. By Albert Astals Cid on 2014-11-26

Merge photoscopeimprovements

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1399
http://jenkins.qa.ubuntu.com/job/unity8-ci/4975/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/362
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/362
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/362/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16261

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

review: Approve (continuous-integration)

[lp:~aacid/unity8/moreAsyncDash]

1400. By Albert Astals Cid on 2014-12-03

Make cacheBuffer int for consistency with Qt own's classes

1401. By Albert Astals Cid on 2014-12-03

Merge

1402. By Albert Astals Cid on 2014-12-03

Small fix after previous real -> int change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1402
http://jenkins.qa.ubuntu.com/job/unity8-ci/5013/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/480
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/190/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/178
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/480
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/480/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16452

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5013/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
 * Did CI run pass? If not, please explain why.
Let's see if it kicks again soon
 * Did you make sure that the branch does not contain spurious tags?
yes

waiting ci again to top approve

review: Approve

=== modified file 'plugins/Dash/abstractdashview.cpp'
--- plugins/Dash/abstractdashview.cpp	2014-05-22 13:37:05 +0000
+++ plugins/Dash/abstractdashview.cpp	2014-12-03 11:06:35 +0000
@@ -16,13 +16,12 @@
 
 #include "abstractdashview.h"
 
-static const qreal bufferRatio = 0.5;
-
 AbstractDashView::AbstractDashView()
  : m_delegateModel(nullptr)
  , m_asyncRequestedIndex(-1)
  , m_columnSpacing(0)
  , m_rowSpacing(0)
+ , m_buffer(320) // Same value used in qquickitemview.cpp in Qt 5.4
  , m_displayMarginBeginning(0)
  , m_displayMarginEnd(0)
  , m_needsRelayout(false)
@@ -112,6 +111,27 @@
     }
 }
 
+int AbstractDashView::cacheBuffer() const
+{
+    return m_buffer;
+}
+
+void AbstractDashView::setCacheBuffer(int buffer)
+{
+    if (buffer < 0) {
+        qmlInfo(this) << "Cannot set a negative cache buffer";
+        return;
+    }
+
+    if (m_buffer != buffer) {
+        m_buffer = buffer;
+        if (isComponentComplete()) {
+            polish();
+        }
+        emit cacheBufferChanged();
+    }
+}
+
 qreal AbstractDashView::displayMarginBeginning() const
 {
     return m_displayMarginBeginning;
@@ -160,9 +180,8 @@
 
     const qreal from = -m_displayMarginBeginning;
     const qreal to = height() + m_displayMarginEnd;
-    const qreal buffer = (to - from) * bufferRatio;
-    const qreal bufferFrom = from - buffer;
-    const qreal bufferTo = to + buffer;
+    const qreal bufferFrom = from - m_buffer;
+    const qreal bufferTo = to + m_buffer;
 
     bool added = addVisibleItems(from, to, false);
     bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
 
=== modified file 'plugins/Dash/abstractdashview.h'
--- plugins/Dash/abstractdashview.h	2014-11-26 10:09:06 +0000
+++ plugins/Dash/abstractdashview.h	2014-12-03 11:06:35 +0000
@@ -35,6 +35,7 @@
     Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)
     Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)
+    Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
     Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning
                                             WRITE setDisplayMarginBeginning
                                             NOTIFY displayMarginBeginningChanged)
@@ -61,6 +62,9 @@
     qreal rowSpacing() const;
     void setRowSpacing(qreal rowSpacing);
 
+    int cacheBuffer() const;
+    void setCacheBuffer(int);
+
     qreal displayMarginBeginning() const;
     void setDisplayMarginBeginning(qreal);
 
@@ -72,6 +76,7 @@
     void delegateChanged();
     void columnSpacingChanged();
     void rowSpacingChanged();
+    void cacheBufferChanged();
     void displayMarginBeginningChanged();
     void displayMarginEndChanged();
 
@@ -117,6 +122,7 @@
 
     int m_columnSpacing;
     int m_rowSpacing;
+    int m_buffer;
     qreal m_displayMarginBeginning;
     qreal m_displayMarginEnd;
     bool m_needsRelayout;
 
=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
--- plugins/Dash/listviewwithpageheader.cpp	2014-11-26 10:09:06 +0000
+++ plugins/Dash/listviewwithpageheader.cpp	2014-12-03 11:06:35 +0000
@@ -334,13 +334,18 @@
     return m_headerItemShownHeight;
 }
 
-qreal ListViewWithPageHeader::cacheBuffer() const
+int ListViewWithPageHeader::cacheBuffer() const
 {
     return m_cacheBuffer;
 }
 
-void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)
+void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)
 {
+    if (cacheBuffer < 0) {
+        qmlInfo(this) << "Cannot set a negative cache buffer";
+        return;
+    }
+
     if (cacheBuffer != m_cacheBuffer) {
         m_cacheBuffer = cacheBuffer;
         Q_EMIT cacheBufferChanged();
 
=== modified file 'plugins/Dash/listviewwithpageheader.h'
--- plugins/Dash/listviewwithpageheader.h	2014-10-10 11:13:26 +0000
+++ plugins/Dash/listviewwithpageheader.h	2014-12-03 11:06:35 +0000
@@ -54,7 +54,7 @@
     Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
     Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
     Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
-    Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
+    Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
 
     friend class ListViewWithPageHeaderTest;
     friend class ListViewWithPageHeaderTestSection;
@@ -85,8 +85,8 @@
     int stickyHeaderHeight() const;
     qreal headerItemShownHeight() const;
 
-    qreal cacheBuffer() const;
-    void setCacheBuffer(qreal cacheBuffer);
+    int cacheBuffer() const;
+    void setCacheBuffer(int cacheBuffer);
 
     Q_INVOKABLE void positionAtBeginning();
     Q_INVOKABLE void showHeader();
@@ -204,7 +204,7 @@
     bool m_forceNoClip;
     bool m_inLayout;
     bool m_inContentHeightKeepHeaderShown;
-    qreal m_cacheBuffer;
+    int m_cacheBuffer;
 
     // Qt 5.0 doesn't like releasing the items just after itemCreated
     // so we delay the releasing until the next updatePolish
 
=== modified file 'qml/Components/ResponsiveVerticalJournal.qml'
--- qml/Components/ResponsiveVerticalJournal.qml	2014-10-02 11:08:26 +0000
+++ qml/Components/ResponsiveVerticalJournal.qml	2014-12-03 11:06:35 +0000
@@ -45,6 +45,7 @@
     property alias rowSpacing: verticalJournalView.rowSpacing
     property alias model: verticalJournalView.model
     property alias delegate: verticalJournalView.delegate
+    property alias cacheBuffer: verticalJournalView.cacheBuffer
     property alias displayMarginBeginning: verticalJournalView.displayMarginBeginning
     property alias displayMarginEnd: verticalJournalView.displayMarginEnd
 
 
=== modified file 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardGrid.qml	2014-10-30 09:13:09 +0000
+++ qml/Dash/CardGrid.qml	2014-12-03 11:06:35 +0000
@@ -50,7 +50,7 @@
         model: root.model
         displayMarginBeginning: root.displayMarginBeginning
         displayMarginEnd: root.displayMarginEnd
-        cacheBuffer: 0
+        cacheBuffer: root.cacheBuffer
         interactive: false
         delegate: Item {
             width: grid.cellWidth
@@ -59,7 +59,6 @@
                 id: loader
                 sourceComponent: cardTool.cardComponent
                 anchors.horizontalCenter: parent.horizontalCenter
-                asynchronous: true
                 onLoaded: {
                     item.objectName = "delegate" + index;
                     item.width = Qt.binding(function() { return cardTool.cardWidth; });
 
=== modified file 'qml/Dash/CardVerticalJournal.qml'
--- qml/Dash/CardVerticalJournal.qml	2014-11-05 15:06:42 +0000
+++ qml/Dash/CardVerticalJournal.qml	2014-12-03 11:06:35 +0000
@@ -59,6 +59,7 @@
         rowSpacing: minimumColumnSpacing
         columnWidth: cardTool.cardWidth
 
+        cacheBuffer: root.cacheBuffer
         displayMarginBeginning: root.displayMarginBeginning
         displayMarginEnd: root.displayMarginEnd
 
 
=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-10-30 21:43:18 +0000
+++ qml/Dash/DashContent.qml	2014-12-03 11:06:35 +0000
@@ -153,6 +153,7 @@
 
             delegate:
                 Loader {
+                    id: loader
                     width: ListView.view.width
                     height: ListView.view.height
                     opacity: { // hide delegate if offscreen
@@ -181,6 +182,7 @@
                         dashContent.scopeLoaded(item.scope.id)
                         item.paginationCount = Qt.binding(function() { return dashContentList.count } )
                         item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )
+                        item.visibleToParent = Qt.binding(function() { return loader.opacity != 0 });
                         item.holdingList = dashContentList;
                         item.forceNonInteractive = Qt.binding(function() { return dashContent.forceNonInteractive } )
                     }
 
=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2014-10-28 09:32:48 +0000
+++ qml/Dash/DashRenderer.qml	2014-12-03 11:06:35 +0000
@@ -23,6 +23,8 @@
 
     property int collapsedItemCount: -1
 
+    property int cacheBuffer: 0
+
     property int displayMarginBeginning: 0
 
     property int displayMarginEnd: 0
 
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-11-06 15:25:51 +0000
+++ qml/Dash/GenericScopeView.qml	2014-12-03 11:06:35 +0000
@@ -38,6 +38,7 @@
     readonly property alias subPageShown: subPageLoader.subPageShown
     property int paginationCount: 0
     property int paginationIndex: 0
+    property bool visibleToParent: false
     property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
     property var holdingList: null
 
@@ -357,6 +358,7 @@
                 Connections {
                     target: scopeView
                     onIsCurrentChanged: rendererLoader.updateRanges();
+                    onVisibleToParentChanged: rendererLoader.updateRanges();
                 }
                 Connections {
                     target: holdingList
@@ -364,7 +366,9 @@
                 }
 
                 function updateRanges() {
-                    if (holdingList && holdingList.moving) {
+                    // Don't want to create stress by requesting more items during scope
+                    // changes so unless you're not part of the visible scopes just return
+                    if (holdingList && holdingList.moving && !scopeView.visibleToParent) {
                         return;
                     }
 
@@ -380,28 +384,50 @@
                     }
 
                     if (item && item.hasOwnProperty("displayMarginBeginning")) {
-                        // A item view is considered visible from
+                        // A item view creates its delegates synchronously from
                         //     -displayMarginBeginning
                         // to
-                        //     height + item.displayMarginEnd
+                        //     height + displayMarginEnd
+                        // Around that area it adds the cacheBuffer area where delegates are created async
+                        //
                         // We adjust displayMarginBeginning and displayMarginEnd so
-                        //   * In non visible scopes only the viewport is considered visible
-                        //     that way when you switch to it the visible items are there
-                        //   * For visible scopes we increase the visible range by categoryView.height * 1.5
-                        //     in both directions to make scrolling nicer by mantaining a higher number of
+                        //   * In non visible scopes nothing is considered visible and we set cacheBuffer
+                        //     so that creates the items that would be in the viewport asynchronously
+                        //   * For the current scope set the visible range to the viewport and then
+                        //     use cacheBuffer to create extra items for categoryView.height * 1.5
+                        //     to make scrolling nicer by mantaining a higher number of
                         //     cached items
-                        // TODO Improvements
-                        //  - For non visible scopes we should always have a visible range of 0 and
-                        //    make sure the items in the viewport are created with the cache buffer feature
-                        //  - For visible scopes we should always the have a visible range be exactly the
-                        //    viewport and make sure the rest of items are created with the cache buffer feature
-                        //  To be able to implement that feature VerticalJournal/AbstractDashView needs to
-                        //  make the cache buffer value setable externally
-                        var extraMargins = scopeView.isCurrent ? categoryView.height * 1.5 : 0;
-
-                        item.displayMarginBeginning = Math.round(-Math.max(-baseItem.y - extraMargins, 0));
-                        item.displayMarginEnd = -Math.round(Math.max(baseItem.height - extraMargins - seeAll.height -
-                                                                        categoryView.height + baseItem.y, 0));
+                        //   * For non current but visible scopes (i.e. when the user changes from one scope
+                        //     to the next, we set the visible range to the viewport so
+                        //     items are not culled (invisible) but still use no cacheBuffer
+                        //     (it will be set once the scope is the current one)
+                        var displayMarginBeginning = baseItem.y;
+                        displayMarginBeginning = -Math.max(-displayMarginBeginning, 0);
+                        displayMarginBeginning = -Math.min(-displayMarginBeginning, baseItem.height);
+                        displayMarginBeginning = Math.round(displayMarginBeginning);
+                        var displayMarginEnd = -baseItem.height + seeAll.height + categoryView.height - baseItem.y;
+                        displayMarginEnd = -Math.max(-displayMarginEnd, 0);
+                        displayMarginEnd = -Math.min(-displayMarginEnd, baseItem.height);
+                        displayMarginEnd = Math.round(displayMarginEnd);
+                        if (scopeView.isCurrent || scopeView.visibleToParent) {
+                            item.displayMarginBeginning = displayMarginBeginning;
+                            item.displayMarginEnd = displayMarginEnd;
+                            item.cacheBuffer = scopeView.isCurrent ? categoryView.height * 1.5 : 0;
+                        } else {
+                            var visibleRange = baseItem.height + displayMarginEnd + displayMarginBeginning;
+                            if (visibleRange < 0) {
+                                item.displayMarginBeginning = displayMarginBeginning;
+                                item.displayMarginEnd = displayMarginEnd;
+                                item.cacheBuffer = 0;
+                            } else {
+                                // This should be visibleRange/2 in each of the properties
+                                // but some item views still (like GridView) like creating sync delegates even if
+                                // the visible range is 0 so let's make sure the visible range is negative
+                                item.displayMarginBeginning = displayMarginBeginning - visibleRange;
+                                item.displayMarginEnd = displayMarginEnd - visibleRange;
+                                item.cacheBuffer = visibleRange;
+                            }
+                        }
                     }
                 }
             }
 
=== modified file 'qml/Dash/ScopeListView.qml'
--- qml/Dash/ScopeListView.qml	2014-10-23 11:59:22 +0000
+++ qml/Dash/ScopeListView.qml	2014-12-03 11:06:35 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,5 +20,7 @@
 ListViewWithPageHeader {
     maximumFlickVelocity: height * 10
     flickDeceleration: height * 2
-    cacheBuffer: Number.MAX_VALUE
+    // 1073741823 is s^30 -1. A quite big number so that you have "infinite" cache, but not so
+    // big so that if you add if with itself you're outside the 2^31 int range
+    cacheBuffer: 1073741823
 }
 
=== modified file 'tests/plugins/Dash/horizontaljournaltest.qml'
--- tests/plugins/Dash/horizontaljournaltest.qml	2014-04-30 10:06:33 +0000
+++ tests/plugins/Dash/horizontaljournaltest.qml	2014-12-03 11:06:35 +0000
@@ -25,6 +25,7 @@
         rowHeight: 150
         columnSpacing: 10
         rowSpacing: 10
+        cacheBuffer: Math.max(0, (height + displayMarginEnd + displayMarginBeginning) / 2)
 
         delegate: Rectangle {
             property real randomValue: Math.random()
 
=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.cpp'
--- tests/plugins/Dash/listviewwithpageheadertest.cpp	2014-08-26 08:41:02 +0000
+++ tests/plugins/Dash/listviewwithpageheadertest.cpp	2014-12-03 11:06:35 +0000
@@ -1920,7 +1920,7 @@
 
     void testAllCacheBuffer()
     {
-        lvwph->setCacheBuffer(std::numeric_limits<qreal>::max());
+        lvwph->setCacheBuffer(std::numeric_limits<int>::max());
         QTRY_COMPARE(lvwph->m_visibleItems.count(), 6);
         QCOMPARE(lvwph->m_firstVisibleIndex, 0);
         verifyItem(0, 50., 150., false);
 
=== modified file 'tests/plugins/Dash/organicgridtest.qml'
--- tests/plugins/Dash/organicgridtest.qml	2014-04-30 10:06:33 +0000
+++ tests/plugins/Dash/organicgridtest.qml	2014-12-03 11:06:35 +0000
@@ -27,6 +27,7 @@
         rowSpacing: 10
         smallDelegateSize: Qt.size(90, 90)
         bigDelegateSize: Qt.size(180, 180)
+        cacheBuffer: Math.max(0, (height + displayMarginEnd + displayMarginBeginning) / 2)
 
         delegate: Rectangle {
             property real randomValue: Math.random()
 
=== modified file 'tests/plugins/Dash/verticaljournaltest.qml'
--- tests/plugins/Dash/verticaljournaltest.qml	2014-04-30 10:06:33 +0000
+++ tests/plugins/Dash/verticaljournaltest.qml	2014-12-03 11:06:35 +0000
@@ -26,6 +26,7 @@
         columnWidth: 150
         columnSpacing: 10
         rowSpacing: 10
+        cacheBuffer: Math.max(0, (height + displayMarginEnd + displayMarginBeginning) / 2)
 
         delegate: Rectangle {
             property real randomValue: Math.random()
 
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-11-26 08:27:45 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-12-03 11:06:35 +0000
@@ -59,6 +59,7 @@
     GenericScopeView {
         id: genericScopeView
         anchors.fill: parent
+        visibleToParent: true
 
         UT.UnityTestCase {
             id: testCase