git.iko.soy/unity8
on xenial help sign in
Fix carousel grid fallback model size.
commit24d839bb51f69ad33310d5e7fe2348ce08baa61f authorMichał Karnicki <michal.karnicki@canonical.com> dateTue 28 Jan 2014, 02:13 (13 years ago) parent7463955
2 files changed+17−2
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml+2−2 tests/qmltests/Dash/tst_GenericScopeView.qml+15
qml/Dash/GenericScopeView.qml+2−2
@@ -325,8 +325,8 @@ FocusScope {
325325 rendererId = getDefaultRendererId(contentType);
326326 }
327327 if (rendererId == "carousel") {
328− // Selectively disable carousel, 6 is fixed for now, should change on the form factor
329− if (results.count <= 6)
328+ // Selectively disable carousel, 5 is fixed for now, should change on the form factor
329+ if (results.count <= 5)
330330 rendererId = "grid"
331331 }
332332 switch (rendererId) {
tests/qmltests/Dash/tst_GenericScopeView.qml+15
@@ -272,6 +272,21 @@ Item {
272272 tryCompare(category, "filtered", true);
273273 }
274274
275+ function test_getRendererCarouselGridFallback() {
276+ var rendererId = "carousel"
277+ var contentType = ""
278+ var rendererHint = ""
279+ var results = new Object()
280+
281+ results.count = 6
282+ var renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
283+ compare(renderer, "Generic/GenericCarousel.qml")
284+
285+ results.count = 5
286+ var renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
287+ compare(renderer, "Generic/GenericFilterGrid.qml")
288+ }
289+
275290 function test_showPreviewCarousel() {
276291 tryCompareFunction(function() { return findChild(genericScopeView, "carouselDelegate") != undefined; }, true);
277292 var tile = findChild(genericScopeView, "carouselDelegate");