git.iko.soy/unity8
on xenial help sign in
Revert changes to GenericScopeView.qml and tests.
3c509d1Michał Sawicz
qml/Dash/GenericScopeView.qml+1−18
compare with xenial
unifiedsplit
@@ -139,15 +139,6 @@ FocusScope {
139 readonly property string category: categoryId
139 readonly property string category: categoryId
140 readonly property var item: rendererLoader.item
140 readonly property var item: rendererLoader.item
141
141
142− CardTool {
143− id: cardTool
144−
145− count: results.count
146− template: model.renderer
147− components: model.components
148− viewWidth: parent.width
149− }
150−
151 Loader {
142 Loader {
152 id: rendererLoader
143 id: rendererLoader
153 anchors {
144 anchors {
@@ -156,14 +147,7 @@ FocusScope {
156 right: parent.right
147 right: parent.right
157 }
148 }
158
149
159− source: {
150+ source: getRenderer(model.renderer, model.contentType, model.rendererHint, results)
160− switch (cardTool.categoryLayout) {
161− case "carousel": return "CardCarousel.qml";
162− case "running-apps": return "Apps/RunningApplicationsGrid.qml";
163− case "grid":
164− default: return "CardFilterGrid.qml";
165− }
166− }
167
151
168 onLoaded: {
152 onLoaded: {
169 if (item.enableHeightBehavior !== undefined && item.enableHeightBehaviorOnNextCreation !== undefined) {
153 if (item.enableHeightBehavior !== undefined && item.enableHeightBehaviorOnNextCreation !== undefined) {
@@ -186,7 +170,6 @@ FocusScope {
186 }
170 }
187 }
171 }
188 updateDelegateCreationRange();
172 updateDelegateCreationRange();
189− item.cardTool = cardTool;
190 }
173 }
191
174
192 Component.onDestruction: {
175 Component.onDestruction: {
tests/qmltests/Dash/tst_GenericScopeView.qml+15
@@ -300,6 +300,21 @@ Item {
300 tryCompare(category, "filtered", true);
300 tryCompare(category, "filtered", true);
301 }
301 }
302
302
303+ function test_getRendererCarouselGridFallback() {
304+ var rendererId = "carousel"
305+ var contentType = ""
306+ var rendererHint = ""
307+ var results = new Object()
308+
309+ results.count = 7
310+ var renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
311+ compare(renderer, "Generic/GenericCarousel.qml")
312+
313+ results.count = 6
314+ renderer = genericScopeView.getRenderer(rendererId, contentType, rendererHint, results)
315+ compare(renderer, "Generic/GenericFilterGrid.qml")
316+ }
317+
303 function test_showPreviewCarousel() {
318 function test_showPreviewCarousel() {
304 tryCompareFunction(function() { return findChild(genericScopeView, "carouselDelegate") != null; }, true);
319 tryCompareFunction(function() { return findChild(genericScopeView, "carouselDelegate") != null; }, true);
305 var tile = findChild(genericScopeView, "carouselDelegate");
320 var tile = findChild(genericScopeView, "carouselDelegate");