f7d2979 · unity8 · git.iko.soy

git.iko.soy/unity8

second scenario and bugfixes for it

commitf7d29798c5fb7a4273edb556a61699e519afcba5 authorAlbert Astals <albert.astals@canonical.com> dateWed 20 Aug 2014, 10:44 (12 years ago) parent3dbd58b

3 files changed+67−8

compare with xenial

unifiedsplit

qml/Dash/GenericScopeView.qml+19−6 tests/mocks/Unity/fake_categories.cpp+2−1 tests/qmltests/Dash/tst_GenericScopeView.qml+46−1

qml/Dash/GenericScopeView.qml+19−6

@@ -152,7 +152,7 @@ FocusScope {

152152 interactive: !navigationShown

153153

154154 property string expandedCategoryId: ""

155− property bool needMaximizeAfterExpand: false

155+ property int runMaximizeAfterSizeChanges: 0

156156

157157 readonly property bool pageHeaderTotallyVisible: scopeView.showPageHeader &&

158158 ((headerItemShownHeight == 0 && categoryView.contentY <= categoryView.originY) || (headerItemShownHeight == pageHeaderLoader.item.height))

@@ -186,7 +186,11 @@ FocusScope {

186186 // If the space that shrkinking is smaller than the one we need to grow we'll call maximizeVisibleArea

187187 // after the shrink/grow animation ends

188188 var growHeightDifference = baseItem.item.expandedHeight - baseItem.item.collapsedHeight;

189− needMaximizeAfterExpand = growHeightDifference > shrinkHeightDifference;

189+ if (growHeightDifference > shrinkHeightDifference) {

190+ runMaximizeAfterSizeChanges = 2;

191+ } else {

192+ runMaximizeAfterSizeChanges = 0;

193+ }

190194 }

191195 }

192196

@@ -253,13 +257,22 @@ FocusScope {

253257 id: heightBehaviour

254258 enabled: false

255259 animation: UbuntuNumberAnimation {

256− duration: categoryView.needMaximizeAfterExpand ? UbuntuAnimation.FastDuration / 2 : UbuntuAnimation.FastDuration

260+ duration: UbuntuAnimation.FastDuration

257261 onRunningChanged: {

258262 if (!running) {

259263 heightBehaviour.enabled = false

260− if (categoryView.needMaximizeAfterExpand && baseItem.category === categoryView.expandedCategoryId) {

261− categoryView.maximizeVisibleArea(index, item.expandedHeight + seeAll.height);

262− categoryView.needMaximizeAfterExpand = false;

264+ if (categoryView.runMaximizeAfterSizeChanges > 0) {

265+ categoryView.runMaximizeAfterSizeChanges--;

266+ if (categoryView.runMaximizeAfterSizeChanges == 0) {

267+ var firstCreated = categoryView.firstCreatedIndex();

268+ for (var i = 0; i < categoryView.createdItemCount(); ++i) {

269+ var baseItem = categoryView.item(firstCreated + i);

270+ if (baseItem.category === categoryView.expandedCategoryId) {

271+ categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAll.height);

272+ break;

273+ }

274+ }

275+ }

263276 }

264277 }

265278 }

tests/mocks/Unity/fake_categories.cpp+2−1

@@ -139,7 +139,8 @@ ResultsModel* Categories::resultModel(int row) const

139139{

140140 ResultsModel *result = m_resultsModels[row];

141141 if (!result) {

142− result = new ResultsModel(15, row);

142+ Categories *that = const_cast<Categories*>(this);

143+ result = new ResultsModel(15, row, that);

143144 m_resultsModels[row] = result;

144145 }

145146 return result;

tests/qmltests/Dash/tst_GenericScopeView.qml+46−1

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -400,7 +400,10 @@ Item {

400400 mockScope.setName("Mock Scope");

401401 mockScope.categories.setCount(2);

402402 mockScope.categories.resultModel(0).setResultCount(50);

403+ mockScope.categories.resultModel(1).setResultCount(15);

404+ mockScope.categories.setLayout(0, "grid");

403405 mockScope.categories.setLayout(1, "grid");

406+ mockScope.categories.setHeaderLink(0, "");

404407 mockScope.categories.setHeaderLink(1, "");

405408 genericScopeView.scope = mockScope;

406409 waitForRendering(genericScopeView.categoryView);

@@ -419,6 +422,7 @@ Item {

419422

420423 scrollToCategory("dashCategory1");

421424

425+ tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory1") !== null; }, true);

422426 var category1 = findChild(genericScopeView, "dashCategory1")

423427 var seeAll1 = findChild(category1, "seeAll")

424428 verify(category1.expandable);

@@ -433,6 +437,47 @@ Item {

433437 == genericScopeView.categoryView.contentHeight;}

434438 , true);

435439 }

440+

441+ function test_seeAllTwoCategoriesScenario2() {

442+ mockScope.setId("mockScope");

443+ mockScope.setName("Mock Scope");

444+ mockScope.categories.setCount(2);

445+ mockScope.categories.resultModel(0).setResultCount(15);

446+ mockScope.categories.resultModel(1).setResultCount(50);

447+ mockScope.categories.setLayout(0, "grid");

448+ mockScope.categories.setLayout(1, "grid");

449+ mockScope.categories.setHeaderLink(0, "");

450+ mockScope.categories.setHeaderLink(1, "");

451+ genericScopeView.scope = mockScope;

452+ waitForRendering(genericScopeView.categoryView);

453+

454+ var category0 = findChild(genericScopeView, "dashCategory0")

455+ var seeAll0 = findChild(category0, "seeAll")

456+

457+ waitForRendering(seeAll0);

458+ verify(category0.expandable);

459+ verify(!category0.expanded);

460+

461+ mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);

462+ verify(category0.expanded);

463+ tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);

464+

465+ scrollToCategory("dashCategory1");

466+

467+ var category1 = findChild(genericScopeView, "dashCategory1")

468+ var seeAll1 = findChild(category1, "seeAll")

469+ verify(category1.expandable);

470+ verify(!category1.expanded);

471+

472+ mouseClick(seeAll1, seeAll1.width / 2, seeAll1.height / 2);

473+ verify(!category0.expanded);

474+ verify(category1.expanded);

475+ tryCompare(category1, "height", category1.item.expandedHeight + seeAll1.height);

476+ tryCompareFunction(function() {

477+ return category0.height + genericScopeView.categoryView.pageHeader.height + category1.y

478+ == genericScopeView.categoryView.contentY;}

479+ , true);

480+ }

436481 }

437482 }

438483}