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

[Albert Astals Cid]

CategoryDelegateRange: Fix condition for detecting overshooting

This is hard to autotest since what was happening is that all the delegates where being created and then immediately destroyed, so at the end the number of delegates we'd have in a tryCompare would be the same.

For manually testing this:
 * Add to Card.qml root
+ Component.onCompleted: console.log("Created", root)
+ Component.onDestruction: console.log("Destroyed", root)
 * And then start the shell and uncollapse the Available category of the Apps scope

Without it you'll see that there's lots of created and destroyed, without it there's only a few created.

* 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

* 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)]

PASSED: Continuous integration, rev:785
http://jenkins.qa.ubuntu.com/job/unity8-ci/2641/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3858
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1166
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3700
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4357
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4357/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3860
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3860/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6139
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5231

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

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

 Yes. Everything still works. The code change makes sense to me.

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

Yip

review: Approve

[Albert Astals Cid (aacid)]

Just realzied a bug in here

[lp:~aacid/unity8/categoryDelegateRangeFixOvershootDetection]

786. By Albert Astals Cid on 2014-04-08

Merge lp:~aacid/unity8/delegateRangeNeedsOriginY

787. By Albert Astals Cid on 2014-04-08

More overshoot check fixes

 * Only do the overshoot checks if we are moving
 * The "real" content height is not contentHeight but contentHeight - originY

788. By Albert Astals Cid on 2014-04-08

Fixes

789. By Albert Astals Cid on 2014-04-17

Merge

Unmerged revisions

=== modified file 'qml/Components/FilterGrid.qml'
--- qml/Components/FilterGrid.qml	2014-01-29 13:35:40 +0000
+++ qml/Components/FilterGrid.qml	2014-04-08 13:51:08 +0000
@@ -59,6 +59,7 @@
     property alias cellHeight: iconTileGrid.cellHeight
     property alias delegateCreationBegin: iconTileGrid.delegateCreationBegin
     property alias delegateCreationEnd: iconTileGrid.delegateCreationEnd
+    readonly property alias originY: iconTileGrid.originY
     readonly property alias flicking: iconTileGrid.flicking
     readonly property alias moving: iconTileGrid.moving
     readonly property alias pressDelay: iconTileGrid.pressDelay
 
=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2014-02-21 11:08:42 +0000
+++ qml/Components/ResponsiveGridView.qml	2014-04-08 13:51:08 +0000
@@ -40,6 +40,7 @@
     readonly property alias flicking: gridView.flicking
     readonly property alias moving: gridView.moving
     readonly property alias pressDelay: gridView.pressDelay
+    readonly property alias originY: gridView.originY
     property alias delegateCreationBegin: gridView.delegateCreationBegin
     property alias delegateCreationEnd: gridView.delegateCreationEnd
     property alias highlightIndex: gridView.highlightIndex
 
=== modified file 'qml/Dash/CardFilterGrid.qml'
--- qml/Dash/CardFilterGrid.qml	2014-03-26 15:09:25 +0000
+++ qml/Dash/CardFilterGrid.qml	2014-04-08 13:51:08 +0000
@@ -24,6 +24,7 @@
     collapsedHeight: filterGrid.collapsedHeight
     margins: filterGrid.margins
     uncollapsedHeight: filterGrid.uncollapsedHeight
+    originY: filterGrid.originY
     verticalSpacing: units.gu(1)
     currentItem: filterGrid.currentItem
     height: filterGrid.height
 
=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2014-03-26 15:09:25 +0000
+++ qml/Dash/DashRenderer.qml	2014-04-08 13:51:08 +0000
@@ -33,6 +33,8 @@
 
     property var delegateCreationEnd: undefined
 
+    property real originY: 0
+
     property real verticalSpacing: 0
 
     // The current item of the renderer
 
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-04-01 22:56:21 +0000
+++ qml/Dash/GenericScopeView.qml	2014-04-08 13:51:08 +0000
@@ -237,26 +237,29 @@
                 }
 
                 function updateDelegateCreationRange() {
-                    // Do not update the range if we are overshooting up or down, since we'll come back
-                    // to the stable position and delete/create items without any reason
-                    if (categoryView.contentY < categoryView.originY) {
-                        return;
-                    } else if (categoryView.contentY + categoryView.height > categoryView.contentHeight) {
-                        return;
+                    if (moving) {
+                        // Do not update the range if we are overshooting up or down, since we'll come back
+                        // to the stable position and delete/create items without any reason
+                        if (categoryView.contentY < categoryView.originY) {
+                            return;
+                        } else if (categoryView.originY + categoryView.contentHeight > categoryView.height &&
+                                   categoryView.contentY + categoryView.height > categoryView.contentHeight) {
+                            return;
+                        }
                     }
 
                     if (item && item.hasOwnProperty("delegateCreationBegin")) {
                         if (baseItem.y + baseItem.height <= 0) {
-                            // Not visible (item at top of the list)
-                            item.delegateCreationBegin = baseItem.height
-                            item.delegateCreationEnd = baseItem.height
+                            // Not visible (item at top of the list viewport)
+                            item.delegateCreationBegin = item.originY + baseItem.height
+                            item.delegateCreationEnd = item.originY + baseItem.height
                         } else if (baseItem.y >= categoryView.height) {
-                            // Not visible (item at bottom of the list)
-                            item.delegateCreationBegin = 0
-                            item.delegateCreationEnd = 0
+                            // Not visible (item at bottom of the list viewport)
+                            item.delegateCreationBegin = item.originY
+                            item.delegateCreationEnd = item.originY
                         } else {
-                            item.delegateCreationBegin = Math.max(-baseItem.y, 0)
-                            item.delegateCreationEnd = Math.min(categoryView.height + item.delegateCreationBegin, baseItem.height)
+                            item.delegateCreationBegin = item.originY + Math.max(-baseItem.y, 0)
+                            item.delegateCreationEnd = item.originY + Math.min(categoryView.height + item.delegateCreationBegin, baseItem.height)
                         }
                     }
                 }