aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickpathview
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2019-05-27 23:36:31 +0200
committerpaolo <paolo.angelelli@qt.io>2019-06-25 15:35:05 +0200
commitab0583eb432bd44d32605e8594cdb3fe2c0a7b8f (patch)
tree5d9348a71d6e8f1046ad1b2e053c6f88627e448b /tests/auto/quick/qquickpathview
parent1762513bad4ca36d8fd78fc87d6e3979391f4626 (diff)
Expose QQuickPath::pointAtPercent as Q_INVOKABLE
So it can be used in QML. Useful in combination with ShapePath, in order to add graphics along a Shape. [ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent as invokable in QML. Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickpathview')
-rw-r--r--tests/auto/quick/qquickpathview/tst_qquickpathview.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 9f7ede44cf..8b963117ed 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -241,7 +241,7 @@ void tst_QQuickPathView::items()
QVERIFY(path);
QVERIFY(pathview->highlightItem());
- QPointF start = path->pointAt(0.0);
+ QPointF start = path->pointAtPercent(0.0);
QPointF offset;
offset.setX(pathview->highlightItem()->width()/2);
offset.setY(pathview->highlightItem()->height()/2);
@@ -919,7 +919,7 @@ void tst_QQuickPathView::pathMoved()
QVERIFY(firstItem);
QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
QVERIFY(path);
- QPointF start = path->pointAt(0.0);
+ QPointF start = path->pointAtPercent(0.0);
QPointF offset;//Center of item is at point, but pos is from corner
offset.setX(firstItem->width()/2);
offset.setY(firstItem->height()/2);
@@ -928,7 +928,7 @@ void tst_QQuickPathView::pathMoved()
for (int i=0; i<model.count(); i++) {
QQuickRectangle *curItem = findItem<QQuickRectangle>(pathview, "wrapper", i);
- QPointF itemPos(path->pointAt(0.25 + i*0.25));
+ QPointF itemPos(path->pointAtPercent(0.25 + i*0.25));
QCOMPARE(curItem->position() + offset, QPointF(itemPos.x(), itemPos.y()));
}
@@ -1007,7 +1007,7 @@ void tst_QQuickPathView::setCurrentIndex()
QVERIFY(firstItem);
QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
QVERIFY(path);
- QPointF start = path->pointAt(0.0);
+ QPointF start = path->pointAtPercent(0.0);
QPointF offset;//Center of item is at point, but pos is from corner
offset.setX(firstItem->width()/2);
offset.setY(firstItem->height()/2);
@@ -1648,7 +1648,7 @@ void tst_QQuickPathView::changePreferredHighlight()
QVERIFY(firstItem);
QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
QVERIFY(path);
- QPointF start = path->pointAt(0.5);
+ QPointF start = path->pointAtPercent(0.5);
QPointF offset;//Center of item is at point, but pos is from corner
offset.setX(firstItem->width()/2);
offset.setY(firstItem->height()/2);
@@ -1656,7 +1656,7 @@ void tst_QQuickPathView::changePreferredHighlight()
pathview->setPreferredHighlightBegin(0.8);
pathview->setPreferredHighlightEnd(0.8);
- start = path->pointAt(0.8);
+ start = path->pointAtPercent(0.8);
QTRY_COMPARE(firstItem->position() + offset, start);
QCOMPARE(pathview->currentIndex(), 0);
@@ -1709,7 +1709,7 @@ void tst_QQuickPathView::currentOffsetOnInsertion()
QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
QVERIFY(path);
- QPointF start = path->pointAt(0.5);
+ QPointF start = path->pointAtPercent(0.5);
QPointF offset;//Center of item is at point, but pos is from corner
offset.setX(item->width()/2);
offset.setY(item->height()/2);
@@ -1798,7 +1798,7 @@ void tst_QQuickPathView::asynchronous()
QVERIFY(firstItem);
QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
QVERIFY(path);
- QPointF start = path->pointAt(0.0);
+ QPointF start = path->pointAtPercent(0.0);
QPointF offset;//Center of item is at point, but pos is from corner
offset.setX(firstItem->width()/2);
offset.setY(firstItem->height()/2);
@@ -1807,7 +1807,7 @@ void tst_QQuickPathView::asynchronous()
for (int i=0; i<5; i++) {
QQuickItem *curItem = findItem<QQuickItem>(pathview, "wrapper", i);
- QPointF itemPos(path->pointAt(0.2 + i*0.2));
+ QPointF itemPos(path->pointAtPercent(0.2 + i*0.2));
QCOMPARE(curItem->position() + offset, itemPos);
}