git.iko.soy/unity8
on xenial help sign in
Minimum number of items in the carousel is 5.
commitdecf7f33e90750c5961eb5b240c648ae6164d92d authorMichał Karnicki <michal.karnicki@canonical.com> dateWed 29 Jan 2014, 15:43 (13 years ago) parent879ac0ea3c70fa
2 files changed+11−11
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml+2−2 tests/qmltests/Dash/tst_GenericScopeView.qml+9−9
qml/Dash/GenericScopeView.qml+2−2
@@ -321,8 +321,8 @@ FocusScope {
321321 var layout = template["category-layout"];
322322
323323 if (layout === "carousel") {
324− // TODO: Selectively disable carousel, 6 is fixed for now, should change depending on form factor
325− if (results.count <= 6) layout = "grid";
324+ // TODO: Selectively disable carousel, 4 is fixed for now, should change depending on form factor
325+ if (results.count <= 4) layout = "grid";
326326 }
327327 switch (layout) {
328328 case "carousel": return "CardCarousel.qml";
tests/qmltests/Dash/tst_GenericScopeView.qml+9−9
@@ -273,18 +273,18 @@ Item {
273273 }
274274
275275 function test_getRendererCarouselGridFallback() {
276− var rendererId = "carousel"
277− var contentType = ""
278− var rendererHint = ""
276+ var template = new Object()
277+ template["category-layout"] = "carousel"
279278 var results = new Object()
279+ var renderer
280280
281− results.count = 7
282− var renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
283− compare(renderer, "Generic/GenericCarousel.qml")
281+ results.count = 5
282+ renderer = genericScopeView.getRenderer(template, results)
283+ compare(renderer, "CardCarousel.qml")
284284
285− results.count = 6
286− renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
287− compare(renderer, "Generic/GenericFilterGrid.qml")
285+ results.count = 4
286+ renderer = genericScopeView.getRenderer(template, results)
287+ compare(renderer, "CardFilterGrid.qml")
288288 }
289289
290290 function test_showPreviewCarousel() {