git.iko.soy/unity8
on xenial help sign in
Fix Merge
commit8abc327fc4780e7a23df296336523124713b2f33 authorAlbert Astals <albert.astals@canonical.com> dateThu 28 Aug 2014, 12:54 (12 years ago) parent05923a4
2 files changed+13−15
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml+2−2 tests/qmltests/Dash/tst_GenericScopeView.qml+11−13
qml/Dash/GenericScopeView.qml+2−2
@@ -174,7 +174,7 @@ FocusScope {
174174 if (shouldExpand != baseItem.expanded) {
175175
176176 var animate = false;
177− if (!previewListView.open) {
177+ if (!subPageLoader.open) {
178178 var animateShrinking = !shouldExpand && baseItem.y + baseItem.item.collapsedHeight + baseItem.seeAll.height < categoryView.height;
179179 var animateGrowing = shouldExpand && baseItem.y + baseItem.height < categoryView.height;
180180 animate = shrinkingAny || animateShrinking || animateGrowing;
@@ -185,7 +185,7 @@ FocusScope {
185185 shrinkHeightDifference = baseItem.item.expandedHeight - baseItem.item.collapsedHeight;
186186 }
187187
188− if (shouldExpand && !previewListView.open) {
188+ if (shouldExpand && !subPageLoader.open) {
189189 if (!shrinkingAny) {
190190 categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAll.height);
191191 } else {
tests/qmltests/Dash/tst_GenericScopeView.qml+11−13
@@ -100,7 +100,7 @@ Item {
100100 {
101101 var categoryListView = findChild(genericScopeView, "categoryListView");
102102 while (!categoryListView.atYEnd) {
103− mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,
103+ mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height - units.gu(8),
104104 genericScopeView.width/2, genericScopeView.y)
105105 tryCompare(categoryListView, "moving", false);
106106 }
@@ -440,7 +440,6 @@ Item {
440440 compare(image.source, data.logo, "Title image has the wrong source");
441441 }
442442
443−<<<<<<< TREE
444443 function test_seeAllTwoCategoriesScenario1() {
445444 mockScope.setId("mockScope");
446445 mockScope.setName("Mock Scope");
@@ -482,17 +481,8 @@ Item {
482481 return genericScopeView.categoryView.contentY + category1.y + category1.height + genericScopeView.categoryView.pageHeader.height
483482 == genericScopeView.categoryView.contentHeight;}
484483 , 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
493484 }
494485
495−<<<<<<< TREE
496486 function test_seeAllTwoCategoriesScenario2() {
497487 mockScope.setId("mockScope");
498488 mockScope.setName("Mock Scope");
@@ -529,7 +519,16 @@ Item {
529519 verify(category1.expanded);
530520 tryCompare(category1, "height", category1.item.expandedHeight + seeAll1.height);
531521 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+
533532 function test_favorite(data) {
534533 genericScopeView.scope = scopes.getScopeFromAll(data.id);
535534 waitForRendering(genericScopeView);
@@ -548,7 +547,6 @@ Item {
548547 tryCompare(genericScopeView.scope, "favorite", !data.favorite);
549548
550549 genericScopeView.scope = !genericScopeView.scope;
551−>>>>>>> MERGE-SOURCE
552550 }
553551 }
554552 }