Merge lp:~fboucault/unity-2d/renderer_grid_limit_count into lp:unity-2d/3.0

[Florian Boucault]

[dash] RendererGrid: actually filter out the items that are not displayed because of group folding.

[Gerry Boland (gerboland)]

Looks fine, accept.

review: Approve

=== modified file 'places/RendererGrid.qml'
--- places/RendererGrid.qml	2011-06-23 17:08:53 +0000
+++ places/RendererGrid.qml	2011-07-27 12:38:23 +0000
@@ -47,18 +47,18 @@
     /* Using results.contentHeight produces binding loop warnings and potential
        rendering issues. We compute the height manually.
     */
-    /* FIXME: tricking the system by making the delegate of height 0 and with
-              an invisible header is no good: the item in the model still
-              exists and some things such as keyboard selection break.
+    /* FIXME: tricking the system by making the delegate of height 0 and invisible
+              is no good: the item in the model still exists and some things
+              such as keyboard selection break.
     */
-    height: results.count > 0 ? header.height + results_layout.anchors.topMargin + results.totalHeight : 0
+    visible: results.model.totalCount > 0
+    height: visible ? header.height + results_layout.anchors.topMargin + results.totalHeight : 0
     //Behavior on height {NumberAnimation {duration: 200}}
 
     GroupHeader {
         id: header
 
-        visible: results.count > 0
-        availableCount: results.count - results.cellsPerRow
+        availableCount: results.model.totalCount - results.cellsPerRow
         folded: parent.folded
         anchors.top: parent.top
         anchors.left: parent.left
@@ -124,9 +124,7 @@
             width: flickable.width
             height: Math.min(totalHeight, flickable.height)
 
-            /* Only display one line of items when folded */
-            property int displayedCount: folded ? cellsPerRow : count
-            property int totalHeight: results.cellHeight*Math.ceil(displayedCount/cellsPerRow)
+            property int totalHeight: results.cellHeight*Math.ceil(count/cellsPerRow)
 
             minHorizontalSpacing: renderer.horizontalSpacing
             minVerticalSpacing: renderer.verticalSpacing
@@ -168,7 +166,11 @@
                 }
             }
 
-            model: renderer.model
+            /* Only display one line of items when folded */
+            model: SortFilterProxyModel {
+                model: renderer.model != undefined ? renderer.model : null
+                limit: folded ? results.cellsPerRow : -1
+            }
         }
     }
 }