Merge lp:~unity-team/unity8/new-scopes-fix-carousel5 into lp:~unity-team/unity8/new-scopes

[Michał Karnicki]

Spec says:
"Minimum number of items in the carousel is 5."

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?
 * No, it only adds a test that covers old spec (<=6 fell back to grid layout)
If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 * No.
If you changed the UI, has there been a design review?
 * UI changes -- carousel minimum item count comes from the spec, so that was a Design team decision.

[lp:~unity-team/unity8/new-scopes-fix-carousel5]

584. By Michał Karnicki on 2014-01-29

Merge new-scopes.

[Michał Sawicz (saviq)]

Yup.

review: Approve

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-01-29 13:46:57 +0000
+++ qml/Dash/GenericScopeView.qml	2014-01-29 13:59:39 +0000
@@ -321,8 +321,8 @@
         var layout = template["category-layout"];
 
         if (layout === "carousel") {
-            // TODO: Selectively disable carousel, 6 is fixed for now, should change depending on form factor
-            if (results.count <= 6) layout = "grid";
+            // TODO: Selectively disable carousel, 4 is fixed for now, should change depending on form factor
+            if (results.count <= 4) layout = "grid";
         }
         switch (layout) {
             case "carousel": return "CardCarousel.qml";

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-01-28 11:16:19 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-01-29 13:59:39 +0000
@@ -273,18 +273,18 @@
             }
 
             function test_getRendererCarouselGridFallback() {
-                var rendererId = "carousel"
-                var contentType = ""
-                var rendererHint = ""
+                var template = new Object()
+                template["category-layout"] = "carousel"
                 var results = new Object()
-
-                results.count = 7
-                var renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
-                compare(renderer, "Generic/GenericCarousel.qml")
-
-                results.count = 6
-                renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
-                compare(renderer, "Generic/GenericFilterGrid.qml")
+                var renderer
+
+                results.count = 5
+                renderer = genericScopeView.getRenderer(template, results)
+                compare(renderer, "CardCarousel.qml")
+
+                results.count = 4
+                renderer = genericScopeView.getRenderer(template, results)
+                compare(renderer, "CardFilterGrid.qml")
             }
 
             function test_showPreviewCarousel() {