6dd0eb6 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

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

6dd0eb6Albert Astals13 years ago

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+3−1

compare with xenial

unifiedsplit

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

380 }

381}

382

383−void ListViewWithPageHeader::maximizeVisibleArea(int modelIndex)

383+bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex)

384{

385 ListItem *listItem = itemAtIndex(modelIndex);

386 if (listItem)

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

399 contentYAnimationType = ContentYAnimationMaximizeVisibleArea;

400 m_contentYAnimation->start();

401 }

402+ return true;

402 }

403 }

404+ return false;

403}

405}

404

406

405qreal ListViewWithPageHeader::minYExtent() const

407qreal ListViewWithPageHeader::minYExtent() const

plugins/ListViewWithPageHeader/listviewwithpageheader.h+4−2

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

89 Q_INVOKABLE void positionAtBeginning();

90 Q_INVOKABLE void showHeader();

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

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

93− Q_INVOKABLE void maximizeVisibleArea(int modelIndex);

95+ Q_INVOKABLE bool maximizeVisibleArea(int modelIndex);

95Q_SIGNALS:

97Q_SIGNALS:

96 void modelChanged();

98 void modelChanged();

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

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

1411

1412 void testMaximizeVisibleArea()

1413 {

1414− lvwph->maximizeVisibleArea(2);

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

1415+ QVERIFY(res);

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

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

1416

1417

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

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

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

1431

1432

1432 void testMaximizeVisibleAreaVisibleItems()

1433 void testMaximizeVisibleAreaVisibleItems()

1433 {

1434 {

1434− lvwph->maximizeVisibleArea(0);

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

1436+ QVERIFY(res);

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

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

1436

1438

1437 verifyInitialTopPosition();

1439 verifyInitialTopPosition();

1438

1440

1439− lvwph->maximizeVisibleArea(1);

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

1442+ QVERIFY(res);

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

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

1441

1444

1442 verifyInitialTopPosition();

1445 verifyInitialTopPosition();

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

1444

1447

1445 void testMaximizeVisibleAreaInvalidIndexes()

1448 void testMaximizeVisibleAreaInvalidIndexes()

1446 {

1449 {

1447− lvwph->maximizeVisibleArea(-1);

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

1451+ QVERIFY(!res);

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

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

1449

1453

1450 verifyInitialTopPosition();

1454 verifyInitialTopPosition();

1451

1455

1452− lvwph->maximizeVisibleArea(1000);

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

1457+ QVERIFY(!res);

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

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

1454

1459

1455 verifyInitialTopPosition();

1460 verifyInitialTopPosition();

1456

1461

1457− lvwph->maximizeVisibleArea(4);

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

1463+ QVERIFY(!res);

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

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

1459

1465

1460 verifyInitialTopPosition();

1466 verifyInitialTopPosition();

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

1463 void testMaximizeVisibleAreaBigElement()

1469 void testMaximizeVisibleAreaBigElement()

1464 {

1470 {

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

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

1466− lvwph->maximizeVisibleArea(2);

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

1473+ QVERIFY(res);

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

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

1468

1475

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

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

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

1483 void testMaximizeVisibleAreaScrollDown()

1490 void testMaximizeVisibleAreaScrollDown()

1484 {

1491 {

1485 changeContentY(250);

1492 changeContentY(250);

1486− lvwph->maximizeVisibleArea(1);

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

1494+ QVERIFY(res);

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

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

1488

1496

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

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

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

1505 {

1513 {

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

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

1507 changeContentY(1150);

1515 changeContentY(1150);

1508− lvwph->maximizeVisibleArea(1);

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

1517+ QVERIFY(res);

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

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

1510

1519

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

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

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

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

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

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

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

1540

1549

1541− lvwph->maximizeVisibleArea(1);

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

1551+ QVERIFY(res);

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

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

1543

1553

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

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

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

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

1713

1714 void testMaximizeVisibleArea()

1715 {

1716− lvwph->maximizeVisibleArea(2);

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

1717+ QVERIFY(res);

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

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

1718

1719

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

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

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

1737

1738

1738 void testMaximizeVisibleAreaVisibleItems()

1739 void testMaximizeVisibleAreaVisibleItems()

1739 {

1740 {

1740− lvwph->maximizeVisibleArea(0);

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

1742+ QVERIFY(res);

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

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

1742

1744

1743 verifyInitialTopPosition();

1745 verifyInitialTopPosition();

1744

1746

1745− lvwph->maximizeVisibleArea(1);

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

1748+ QVERIFY(res);

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

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

1747

1750

1748 verifyInitialTopPosition();

1751 verifyInitialTopPosition();

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

1750

1753

1751 void testMaximizeVisibleAreaInvalidIndexes()

1754 void testMaximizeVisibleAreaInvalidIndexes()

1752 {

1755 {

1753− lvwph->maximizeVisibleArea(-1);

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

1757+ QVERIFY(!res);

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

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

1755

1759

1756 verifyInitialTopPosition();

1760 verifyInitialTopPosition();

1757

1761

1758− lvwph->maximizeVisibleArea(1000);

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

1763+ QVERIFY(!res);

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

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

1760

1765

1761 verifyInitialTopPosition();

1766 verifyInitialTopPosition();

1762

1767

1763− lvwph->maximizeVisibleArea(3);

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

1769+ QVERIFY(!res);

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

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

1765

1771

1766 verifyInitialTopPosition();

1772 verifyInitialTopPosition();

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

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

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

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

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

1773

1779

1774− lvwph->maximizeVisibleArea(2);

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

1781+ QVERIFY(res);

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

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

1776

1783

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

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

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

1792 void testMaximizeVisibleAreaScrollDown()

1799 void testMaximizeVisibleAreaScrollDown()

1793 {

1800 {

1794 changeContentY(350);

1801 changeContentY(350);

1795− lvwph->maximizeVisibleArea(1);

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

1803+ QVERIFY(res);

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

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

1797

1805

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

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

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

1815 {

1823 {

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

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

1817 changeContentY(1150);

1825 changeContentY(1150);

1818− lvwph->maximizeVisibleArea(1);

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

1827+ QVERIFY(res);

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

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

1820

1829

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

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

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

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

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

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

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

1858

1867

1859− lvwph->maximizeVisibleArea(1);

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

1869+ QVERIFY(res);

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

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

1861

1871

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

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