decf7f3 · unity8 · git.iko.soy

on xenial help sign in

Minimum number of items in the carousel is 5.

decf7f3Michał Karnicki13 years ago

qml/Dash/GenericScopeView.qml+2−2

@@ -321,8 +321,8 @@ FocusScope {

321 var layout = template["category-layout"];

322

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 }

327 switch (layout) {

328 case "carousel": return "CardCarousel.qml";

tests/qmltests/Dash/tst_GenericScopeView.qml+9−9

@@ -273,18 +273,18 @@ Item {

273 }

274

275 function test_getRendererCarouselGridFallback() {

276− var rendererId = "carousel"

276+ var template = new Object()

277− var contentType = ""

277+ template["category-layout"] = "carousel"

278− var rendererHint = ""

279 var results = new Object()

278 var results = new Object()

279+ var renderer

280

281− results.count = 7

281+ results.count = 5

282− var renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)

282+ renderer = genericScopeView.getRenderer(template, results)

283− compare(renderer, "Generic/GenericCarousel.qml")

283+ compare(renderer, "CardCarousel.qml")

284

285− results.count = 6

285+ results.count = 4

286− renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)

286+ renderer = genericScopeView.getRenderer(template, results)

287− compare(renderer, "Generic/GenericFilterGrid.qml")

287+ compare(renderer, "CardFilterGrid.qml")

288 }

289

290 function test_showPreviewCarousel() {