git.iko.soy/unity8
on xenial help sign in
Pay attention to the spec.
2943ee2Michał Karnicki
qml/Dash/GenericScopeView.qml+1−1
compare with xenial
unifiedsplit
@@ -326,7 +326,7 @@ FocusScope {
326 }
326 }
327 if (rendererId == "carousel") {
327 if (rendererId == "carousel") {
328 // Selectively disable carousel, 5 is fixed for now, should change on the form factor
328 // Selectively disable carousel, 5 is fixed for now, should change on the form factor
329− if (results.count <= 5)
329+ if (results.count < 5)
330 rendererId = "grid"
330 rendererId = "grid"
331 }
331 }
332 switch (rendererId) {
332 switch (rendererId) {
tests/qmltests/Dash/tst_GenericScopeView.qml+2−2
@@ -278,11 +278,11 @@ Item {
278 var rendererHint = ""
278 var rendererHint = ""
279 var results = new Object()
279 var results = new Object()
280
280
281− results.count = 6
281+ results.count = 5
282 var renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
282 var renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
283 compare(renderer, "Generic/GenericCarousel.qml")
283 compare(renderer, "Generic/GenericCarousel.qml")
284
284
285− results.count = 5
285+ results.count = 4
286 var renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
286 var renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
287 compare(renderer, "Generic/GenericFilterGrid.qml")
287 compare(renderer, "Generic/GenericFilterGrid.qml")
288 }
288 }