git.iko.soy/unity8
on xenial help sign in
Minimum number of items in the carousel is 5.
f014c59Michał Karnicki
qml/Dash/GenericScopeView.qml+2−2
compare with xenial
unifiedsplit
@@ -321,8 +321,8 @@ FocusScope {
321 var layout = template["category-layout"];
321 var layout = template["category-layout"];
322
322
323 if (layout === "carousel") {
323 if (layout === "carousel") {
324− // TODO: Selectively disable carousel, 6 is fixed for now, should change depending on form factor
324+ // TODO: Selectively disable carousel, 4 is fixed for now, should change depending on form factor
325− if (results.count <= 6) layout = "grid";
325+ if (results.count <= 4) layout = "grid";
326 }
326 }
327 switch (layout) {
327 switch (layout) {
328 case "carousel": return "CardCarousel.qml";
328 case "carousel": return "CardCarousel.qml";
tests/qmltests/Dash/tst_GenericScopeView.qml+15
@@ -272,6 +272,21 @@ Item {
272 tryCompare(category, "filtered", true);
272 tryCompare(category, "filtered", true);
273 }
273 }
274
274
275+ function test_getRendererCarouselGridFallback() {
276+ var template = new Object()
277+ template["category-layout"] = "carousel"
278+ var results = new Object()
279+ var renderer
280+
281+ results.count = 5
282+ renderer = genericScopeView.getRenderer(template, results)
283+ compare(renderer, "CardCarousel.qml")
284+
285+ results.count = 4
286+ renderer = genericScopeView.getRenderer(template, results)
287+ compare(renderer, "CardFilterGrid.qml")
288+ }
289+
275 function test_showPreviewCarousel() {
290 function test_showPreviewCarousel() {
276 tryCompareFunction(function() { return findChild(genericScopeView, "carouselDelegate") != undefined; }, true);
291 tryCompareFunction(function() { return findChild(genericScopeView, "carouselDelegate") != undefined; }, true);
277 var tile = findChild(genericScopeView, "carouselDelegate");
292 var tile = findChild(genericScopeView, "carouselDelegate");