@@ -32,7 +32,7 @@ Item {
32 id: scopes
32 id: scopes
34 onLoadedChanged: {
34 onLoadedChanged: {
35− genericScopeView.scope = scopes.get(0)
35+ genericScopeView.scope = scopes.get(2)
@@ -41,17 +41,10 @@ Item {
41 signal mainStageFocusedApplicationChanged()
41 signal mainStageFocusedApplicationChanged()
47− openEffect: openEffect
48− categoryView: genericScopeView.categoryView
49− scope: genericScopeView.scope
52 DashContentOpenEffect {
44 DashContentOpenEffect {
53 id: openEffect
45 id: openEffect
54 previewListView: previewListView
46 previewListView: previewListView
47+ sourceItem: genericScopeView
57 PageHeaderLabel {
50 PageHeaderLabel {
@@ -101,36 +94,42 @@ Item {
101 function test_showDash() {
94 function test_showDash() {
102 previewListView.open = true;
95 previewListView.open = true;
103 tryCompare(openEffect, "live", true);
96 tryCompare(openEffect, "live", true);
104− scopes.get(0).showDash();
97+ scopes.get(2).showDash();
105 tryCompare(previewListView, "open", false);
98 tryCompare(previewListView, "open", false);
106 tryCompare(openEffect, "live", true);
99 tryCompare(openEffect, "live", true);
109 function test_hideDash() {
102 function test_hideDash() {
110 previewListView.open = true;
103 previewListView.open = true;
111− scopes.get(0).hideDash();
104+ scopes.get(2).hideDash();
112 tryCompare(previewListView, "open", false);
105 tryCompare(previewListView, "open", false);
106+ tryCompare(openEffect, "gap", 0);
115− function openPreview() {
109+ function openPreview(filterGridName, willOpen) {
116− var categoryListView = findChild(genericScopeView, "categoryListView");
110+ if (filterGridName === undefined)
117− categoryListView.positionAtBeginning();
111+ filterGridName = "0";
118−
112+ if (willOpen === undefined)
119 tryCompareFunction(function() {
114 tryCompareFunction(function() {
120− var tile = findChild(findChild(genericScopeView, "0"), "delegate0");
115+ var filterGrid = findChild(genericScopeView, filterGridName);
116+ if (filterGrid != null) {
117+ var tile = findChild(filterGrid, "delegate0");
121− return tile != undefined;
118+ return tile != null;
124− var tile = findChild(findChild(genericScopeView, "0"), "delegate0");
123+ var tile = findChild(findChild(genericScopeView, filterGridName), "delegate0");
125 mouseClick(tile, tile.width / 2, tile.height / 2);
124 mouseClick(tile, tile.width / 2, tile.height / 2);
126− tryCompare(previewListView, "open", true);
125+ tryCompare(previewListView, "open", willOpen);
127− tryCompare(openEffect, "gap", 1);
126+ tryCompare(openEffect, "gap", willOpen ? 1 : 0);
130 function checkArrowPosition(index) {
129 function checkArrowPosition(index) {
131 tryCompareFunction(function() {
130 tryCompareFunction(function() {
132 var tile = findChild(findChild(genericScopeView, "0"), "delegate" + index);
131 var tile = findChild(findChild(genericScopeView, "0"), "delegate" + index);
133− return tile != undefined;
132+ return tile != null;
136 var tile = findChild(findChild(genericScopeView, "0"), "delegate" + index);
135 var tile = findChild(findChild(genericScopeView, "0"), "delegate" + index);
@@ -154,6 +153,8 @@ Item {
155 function test_previewOpenClose() {
154 function test_previewOpenClose() {
156 tryCompare(previewListView, "open", false);
155 tryCompare(previewListView, "open", false);
156+ var categoryListView = findChild(genericScopeView, "categoryListView");
157+ categoryListView.positionAtBeginning();
158 openPreview();
159 openPreview();
@@ -193,7 +194,11 @@ Item {
195 function test_previewCycle() {
196 function test_previewCycle() {
197+ var categoryListView = findChild(genericScopeView, "categoryListView");
198+ categoryListView.positionAtBeginning();
196 tryCompare(previewListView, "open", false);
200 tryCompare(previewListView, "open", false);
201+ tryCompare(openEffect, "gap", 0);
198 openPreview();
203 openPreview();
@@ -211,7 +216,7 @@ Item {
211 checkArrowPosition(0);
216 checkArrowPosition(0);
213 // flick to the next previews
218 // flick to the next previews
214−
219+ tryCompare(previewListView, "count", 15);
215 for (var i = 1; i < previewListView.count; ++i) {
220 for (var i = 1; i < previewListView.count; ++i) {
217 mouseFlick(previewListView, previewListView.width - units.gu(1),
222 mouseFlick(previewListView, previewListView.width - units.gu(1),
@@ -246,8 +251,13 @@ Item {
248 function test_show_spinner() {
253 function test_show_spinner() {
254+ var categoryListView = findChild(genericScopeView, "categoryListView");
255+ waitForRendering(categoryListView);
256+ categoryListView.contentY = units.gu(13);
249 openPreview();
257 openPreview();
250 var previewLoader = findChild(previewListView, "previewLoader0");
258 var previewLoader = findChild(previewListView, "previewLoader0");
259+ compare(previewLoader.source.toString().split("/").pop(), "DashPreviewPlaceholder.qml");
260+ compare(categoryListView.contentY, 0)
251 tryCompare(previewLoader, "progress", 1.0);
261 tryCompare(previewLoader, "progress", 1.0);
252 tryCompareFunction(function() { return previewLoader.item != undefined; }, true);
262 tryCompareFunction(function() { return previewLoader.item != undefined; }, true);
@@ -263,13 +273,13 @@ Item {
263 function test_changeScope() {
273 function test_changeScope() {
264 genericScopeView.scope.searchQuery = "test"
274 genericScopeView.scope.searchQuery = "test"
265 genericScopeView.scope = scopes.get(1)
275 genericScopeView.scope = scopes.get(1)
266− genericScopeView.scope = scopes.get(0)
276+ genericScopeView.scope = scopes.get(2)
267 tryCompare(genericScopeView.scope, "searchQuery", "")
277 tryCompare(genericScopeView.scope, "searchQuery", "")
270 function test_filter_expand_collapse() {
280 function test_filter_expand_collapse() {
271 // wait for the item to be there
281 // wait for the item to be there
272− tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != undefined; }, true);
282+ tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != null; }, true);
274 var header = findChild(genericScopeView, "dashSectionHeader0")
284 var header = findChild(genericScopeView, "dashSectionHeader0")
275 var category = findChild(genericScopeView, "dashCategory0")
285 var category = findChild(genericScopeView, "dashCategory0")
@@ -306,7 +316,7 @@ Item {
308 function test_showPreviewCarousel() {
318 function test_showPreviewCarousel() {
309− tryCompareFunction(function() { return findChild(genericScopeView, "carouselDelegate") != undefined; }, true);
319+ tryCompareFunction(function() { return findChild(genericScopeView, "carouselDelegate") != null; }, true);
310 var tile = findChild(genericScopeView, "carouselDelegate");
320 var tile = findChild(genericScopeView, "carouselDelegate");
311 mouseClick(tile, tile.width / 2, tile.height / 2);
321 mouseClick(tile, tile.width / 2, tile.height / 2);
312 tryCompare(openEffect, "gap", 1);
322 tryCompare(openEffect, "gap", 1);
@@ -332,15 +342,15 @@ Item {
332 tryCompare(previewListView, "open", false);
342 tryCompare(previewListView, "open", false);
335− function test_filter_expand_expand() {
345+ function test_filter_expand_expand_collapse() {
336 // wait for the item to be there
346 // wait for the item to be there
337− tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2") != undefined; }, true);
347+ tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeaderapplications.scope") != null; }, true);
339 var categoryListView = findChild(genericScopeView, "categoryListView");
349 var categoryListView = findChild(genericScopeView, "categoryListView");
340 categoryListView.contentY = categoryListView.height;
350 categoryListView.contentY = categoryListView.height;
342− var header2 = findChild(genericScopeView, "dashSectionHeader2")
352+ var header2 = findChild(genericScopeView, "dashSectionHeaderapplications.scope")
343− var category2 = findChild(genericScopeView, "dashCategory2")
353+ var category2 = findChild(genericScopeView, "dashCategoryapplications.scope")
344 var category2FilterGrid = category2.children[0].children[0].children[0];
354 var category2FilterGrid = category2.children[0].children[0].children[0];
345 verify(UT.Util.isInstanceOf(category2FilterGrid, "FilterGrid"));
355 verify(UT.Util.isInstanceOf(category2FilterGrid, "FilterGrid"));
@@ -368,11 +378,30 @@ Item {
368 tryCompare(category0, "filtered", false);
378 tryCompare(category0, "filtered", false);
369 tryCompare(category2, "filtered", true);
379 tryCompare(category2, "filtered", true);
370 tryCompare(category2FilterGrid, "filter", true);
380 tryCompare(category2FilterGrid, "filter", true);
381+ mouseClick(header0, header0.width / 2, header0.height / 2);
382+ tryCompare(category0, "filtered", true);
383+ tryCompare(category2, "filtered", true);
386+ function test_bug1271676_no_move_y_no_preview() {
387+ waitForRendering(genericScopeView);
388+ var categoryListView = findChild(genericScopeView, "categoryListView");
389+ waitForRendering(categoryListView);
390+ tryCompareFunction(function() { return findChild(genericScopeView, "dashCategoryapplications.scope") != null; }, true);
391+ var category = findChild(genericScopeView, "dashCategoryapplications.scope")
392+ categoryListView.contentY = category.y;
393+ waitForRendering(categoryListView);
394+ var contentYBefore = categoryListView.contentY
395+ openPreview("applications.scope", false); // This actually doesn't open anything because we
396+ // have code so that the item of installed
397+ // does activate instead of preview and never shows a preview
398+ compare(categoryListView.contentY, contentYBefore);
373 function test_narrow_delegate_ranges_expand() {
401 function test_narrow_delegate_ranges_expand() {
374 tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);
402 tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);
375 var category = findChild(genericScopeView, "dashCategory0")
403 var category = findChild(genericScopeView, "dashCategory0")
404+ tryCompare(category, "filtered", true);
377 shell.width = units.gu(20)
406 shell.width = units.gu(20)
378 var categoryListView = findChild(genericScopeView, "categoryListView");
407 var categoryListView = findChild(genericScopeView, "categoryListView");
@@ -386,4 +415,12 @@ Item {
421+ anchors.fill: parent
422+ openEffect: openEffect
423+ categoryView: genericScopeView.categoryView
424+ scope: genericScopeView.scope