git.iko.soy/unity8
on xenial help sign in
Fix Merge
8abc327Albert Astals
qml/Dash/GenericScopeView.qml+2−2
compare with xenial
unifiedsplit
@@ -174,7 +174,7 @@ FocusScope {
174 if (shouldExpand != baseItem.expanded) {
174 if (shouldExpand != baseItem.expanded) {
175
175
176 var animate = false;
176 var animate = false;
177− if (!previewListView.open) {
177+ if (!subPageLoader.open) {
178 var animateShrinking = !shouldExpand && baseItem.y + baseItem.item.collapsedHeight + baseItem.seeAll.height < categoryView.height;
178 var animateShrinking = !shouldExpand && baseItem.y + baseItem.item.collapsedHeight + baseItem.seeAll.height < categoryView.height;
179 var animateGrowing = shouldExpand && baseItem.y + baseItem.height < categoryView.height;
179 var animateGrowing = shouldExpand && baseItem.y + baseItem.height < categoryView.height;
180 animate = shrinkingAny || animateShrinking || animateGrowing;
180 animate = shrinkingAny || animateShrinking || animateGrowing;
@@ -185,7 +185,7 @@ FocusScope {
185 shrinkHeightDifference = baseItem.item.expandedHeight - baseItem.item.collapsedHeight;
185 shrinkHeightDifference = baseItem.item.expandedHeight - baseItem.item.collapsedHeight;
186 }
186 }
187
187
188− if (shouldExpand && !previewListView.open) {
188+ if (shouldExpand && !subPageLoader.open) {
189 if (!shrinkingAny) {
189 if (!shrinkingAny) {
190 categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAll.height);
190 categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAll.height);
191 } else {
191 } else {
tests/qmltests/Dash/tst_GenericScopeView.qml+11−13
@@ -100,7 +100,7 @@ Item {
100 {
100 {
101 var categoryListView = findChild(genericScopeView, "categoryListView");
101 var categoryListView = findChild(genericScopeView, "categoryListView");
102 while (!categoryListView.atYEnd) {
102 while (!categoryListView.atYEnd) {
103− mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,
103+ mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height - units.gu(8),
104 genericScopeView.width/2, genericScopeView.y)
104 genericScopeView.width/2, genericScopeView.y)
105 tryCompare(categoryListView, "moving", false);
105 tryCompare(categoryListView, "moving", false);
106 }
106 }
@@ -440,7 +440,6 @@ Item {
440 compare(image.source, data.logo, "Title image has the wrong source");
440 compare(image.source, data.logo, "Title image has the wrong source");
441 }
441 }
442
442
443−<<<<<<< TREE
444 function test_seeAllTwoCategoriesScenario1() {
443 function test_seeAllTwoCategoriesScenario1() {
445 mockScope.setId("mockScope");
444 mockScope.setId("mockScope");
446 mockScope.setName("Mock Scope");
445 mockScope.setName("Mock Scope");
@@ -482,17 +481,8 @@ Item {
482 return genericScopeView.categoryView.contentY + category1.y + category1.height + genericScopeView.categoryView.pageHeader.height
481 return genericScopeView.categoryView.contentY + category1.y + category1.height + genericScopeView.categoryView.pageHeader.height
483 == genericScopeView.categoryView.contentHeight;}
482 == genericScopeView.categoryView.contentHeight;}
484 , true);
483 , true);
485−=======
486− function test_favorite_data() {
487− return [
488− { tag: "People", id: "MockScope1", favorite: true },
489− { tag: "Music", id: "MockScope2", favorite: false },
490− { tag: "Apps", id: "clickscope", favorite: true },
491− ];
492−>>>>>>> MERGE-SOURCE
493 }
484 }
494
485
495−<<<<<<< TREE
496 function test_seeAllTwoCategoriesScenario2() {
486 function test_seeAllTwoCategoriesScenario2() {
497 mockScope.setId("mockScope");
487 mockScope.setId("mockScope");
498 mockScope.setName("Mock Scope");
488 mockScope.setName("Mock Scope");
@@ -529,7 +519,16 @@ Item {
529 verify(category1.expanded);
519 verify(category1.expanded);
530 tryCompare(category1, "height", category1.item.expandedHeight + seeAll1.height);
520 tryCompare(category1, "height", category1.item.expandedHeight + seeAll1.height);
531 tryCompare(category1, "y", units.gu(5));
521 tryCompare(category1, "y", units.gu(5));
532−=======
522+ }
523+
524+ function test_favorite_data() {
525+ return [
526+ { tag: "People", id: "MockScope1", favorite: true },
527+ { tag: "Music", id: "MockScope2", favorite: false },
528+ { tag: "Apps", id: "clickscope", favorite: true },
529+ ];
530+ }
531+
533 function test_favorite(data) {
532 function test_favorite(data) {
534 genericScopeView.scope = scopes.getScopeFromAll(data.id);
533 genericScopeView.scope = scopes.getScopeFromAll(data.id);
535 waitForRendering(genericScopeView);
534 waitForRendering(genericScopeView);
@@ -548,7 +547,6 @@ Item {
548 tryCompare(genericScopeView.scope, "favorite", !data.favorite);
547 tryCompare(genericScopeView.scope, "favorite", !data.favorite);
549
548
550 genericScopeView.scope = !genericScopeView.scope;
549 genericScopeView.scope = !genericScopeView.scope;
551−>>>>>>> MERGE-SOURCE
552 }
550 }
553 }
551 }
554 }
552 }