6dd0eb6 · unity8 · git.iko.soy

git.iko.soy/unity8

Add a bool saying if we tried to do something or not

commit6dd0eb62f384f6c62f91ec1eabeeaa7b61830d6a authorAlbert Astals <albert.astals@canonical.com> dateWed 7 Aug 2013, 13:31 (13 years ago) parentba83189

4 files changed+47−23

compare with xenial

unifiedsplit

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+3−1 plugins/ListViewWithPageHeader/listviewwithpageheader.h+4−2 tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+20−10 tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp+20−10

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+3−1

@@ -380,7 +380,7 @@ void ListViewWithPageHeader::showHeader()

380380 }

381381}

382382

383−void ListViewWithPageHeader::maximizeVisibleArea(int modelIndex)

383+bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex)

384384{

385385 ListItem *listItem = itemAtIndex(modelIndex);

386386 if (listItem)

@@ -399,7 +399,9 @@ void ListViewWithPageHeader::maximizeVisibleArea(int modelIndex)

399399 contentYAnimationType = ContentYAnimationMaximizeVisibleArea;

400400 m_contentYAnimation->start();

401401 }

402+ return true;

402403 }

404+ return false;

403405}

404406

405407qreal ListViewWithPageHeader::minYExtent() const

plugins/ListViewWithPageHeader/listviewwithpageheader.h+4−2

@@ -89,8 +89,10 @@ public:

8989 Q_INVOKABLE void positionAtBeginning();

9090 Q_INVOKABLE void showHeader();

9191

92− // The index has to be visible for this to try to do something

93− Q_INVOKABLE void maximizeVisibleArea(int modelIndex);

92+ // The index has to be created for this to try to do something

93+ // Created items are those visible and the precached ones

94+ // Returns if the item existed or not

95+ Q_INVOKABLE bool maximizeVisibleArea(int modelIndex);

9496

9597Q_SIGNALS:

9698 void modelChanged();

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+20−10

@@ -1411,7 +1411,8 @@ private Q_SLOTS:

14111411

14121412 void testMaximizeVisibleArea()

14131413 {

1414− lvwph->maximizeVisibleArea(2);

1414+ bool res = lvwph->maximizeVisibleArea(2);

1415+ QVERIFY(res);

14151416 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

14161417

14171418 QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

@@ -1431,12 +1432,14 @@ private Q_SLOTS:

14311432

14321433 void testMaximizeVisibleAreaVisibleItems()

14331434 {

1434− lvwph->maximizeVisibleArea(0);

1435+ bool res = lvwph->maximizeVisibleArea(0);

1436+ QVERIFY(res);

14351437 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

14361438

14371439 verifyInitialTopPosition();

14381440

1439− lvwph->maximizeVisibleArea(1);

1441+ res = lvwph->maximizeVisibleArea(1);

1442+ QVERIFY(res);

14401443 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

14411444

14421445 verifyInitialTopPosition();

@@ -1444,17 +1447,20 @@ private Q_SLOTS:

14441447

14451448 void testMaximizeVisibleAreaInvalidIndexes()

14461449 {

1447− lvwph->maximizeVisibleArea(-1);

1450+ bool res = lvwph->maximizeVisibleArea(-1);

1451+ QVERIFY(!res);

14481452 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

14491453

14501454 verifyInitialTopPosition();

14511455

1452− lvwph->maximizeVisibleArea(1000);

1456+ res = lvwph->maximizeVisibleArea(1000);

1457+ QVERIFY(!res);

14531458 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

14541459

14551460 verifyInitialTopPosition();

14561461

1457− lvwph->maximizeVisibleArea(4);

1462+ res = lvwph->maximizeVisibleArea(4);

1463+ QVERIFY(!res);

14581464 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

14591465

14601466 verifyInitialTopPosition();

@@ -1463,7 +1469,8 @@ private Q_SLOTS:

14631469 void testMaximizeVisibleAreaBigElement()

14641470 {

14651471 model->setProperty(2, "size", 4000);

1466− lvwph->maximizeVisibleArea(2);

1472+ bool res = lvwph->maximizeVisibleArea(2);

1473+ QVERIFY(res);

14671474 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

14681475

14691476 QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);

@@ -1483,7 +1490,8 @@ private Q_SLOTS:

14831490 void testMaximizeVisibleAreaScrollDown()

14841491 {

14851492 changeContentY(250);

1486− lvwph->maximizeVisibleArea(1);

1493+ bool res = lvwph->maximizeVisibleArea(1);

1494+ QVERIFY(res);

14871495 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

14881496

14891497 QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

@@ -1505,7 +1513,8 @@ private Q_SLOTS:

15051513 {

15061514 model->setProperty(1, "size", 1000);

15071515 changeContentY(1150);

1508− lvwph->maximizeVisibleArea(1);

1516+ bool res = lvwph->maximizeVisibleArea(1);

1517+ QVERIFY(res);

15091518 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

15101519

15111520 QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

@@ -1538,7 +1547,8 @@ private Q_SLOTS:

15381547 QCOMPARE(lvwph->contentY(), 650.);

15391548 QCOMPARE(lvwph->m_headerItemShownHeight, 0.);

15401549

1541− lvwph->maximizeVisibleArea(1);

1550+ bool res = lvwph->maximizeVisibleArea(1);

1551+ QVERIFY(res);

15421552 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

15431553

15441554 QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp+20−10

@@ -1713,7 +1713,8 @@ private Q_SLOTS:

17131713

17141714 void testMaximizeVisibleArea()

17151715 {

1716− lvwph->maximizeVisibleArea(2);

1716+ bool res = lvwph->maximizeVisibleArea(2);

1717+ QVERIFY(res);

17171718 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

17181719

17191720 QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

@@ -1737,12 +1738,14 @@ private Q_SLOTS:

17371738

17381739 void testMaximizeVisibleAreaVisibleItems()

17391740 {

1740− lvwph->maximizeVisibleArea(0);

1741+ bool res = lvwph->maximizeVisibleArea(0);

1742+ QVERIFY(res);

17411743 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

17421744

17431745 verifyInitialTopPosition();

17441746

1745− lvwph->maximizeVisibleArea(1);

1747+ res = lvwph->maximizeVisibleArea(1);

1748+ QVERIFY(res);

17461749 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

17471750

17481751 verifyInitialTopPosition();

@@ -1750,17 +1753,20 @@ private Q_SLOTS:

17501753

17511754 void testMaximizeVisibleAreaInvalidIndexes()

17521755 {

1753− lvwph->maximizeVisibleArea(-1);

1756+ bool res = lvwph->maximizeVisibleArea(-1);

1757+ QVERIFY(!res);

17541758 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

17551759

17561760 verifyInitialTopPosition();

17571761

1758− lvwph->maximizeVisibleArea(1000);

1762+ res = lvwph->maximizeVisibleArea(1000);

1763+ QVERIFY(!res);

17591764 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

17601765

17611766 verifyInitialTopPosition();

17621767

1763− lvwph->maximizeVisibleArea(3);

1768+ res = lvwph->maximizeVisibleArea(3);

1769+ QVERIFY(!res);

17641770 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

17651771

17661772 verifyInitialTopPosition();

@@ -1771,7 +1777,8 @@ private Q_SLOTS:

17711777 model->setProperty(2, "size", 4000);

17721778 verifyItem(2, 480, 4040., false, "Mild", false);

17731779

1774− lvwph->maximizeVisibleArea(2);

1780+ bool res = lvwph->maximizeVisibleArea(2);

1781+ QVERIFY(res);

17751782 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

17761783

17771784 QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);

@@ -1792,7 +1799,8 @@ private Q_SLOTS:

17921799 void testMaximizeVisibleAreaScrollDown()

17931800 {

17941801 changeContentY(350);

1795− lvwph->maximizeVisibleArea(1);

1802+ bool res = lvwph->maximizeVisibleArea(1);

1803+ QVERIFY(res);

17961804 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

17971805

17981806 QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

@@ -1815,7 +1823,8 @@ private Q_SLOTS:

18151823 {

18161824 model->setProperty(1, "size", 1000);

18171825 changeContentY(1150);

1818− lvwph->maximizeVisibleArea(1);

1826+ bool res = lvwph->maximizeVisibleArea(1);

1827+ QVERIFY(res);

18191828 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

18201829

18211830 QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

@@ -1856,7 +1865,8 @@ private Q_SLOTS:

18561865 QCOMPARE(sectionDelegateIndex(lvwph->m_topSectionItem), 1);

18571866 QCOMPARE(lvwph->m_topSectionItem->y(), 0.);

18581867

1859− lvwph->maximizeVisibleArea(1);

1868+ bool res = lvwph->maximizeVisibleArea(1);

1869+ QVERIFY(res);

18601870 QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

18611871

18621872 QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);