diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2012-05-16 12:59:32 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-18 01:01:40 +0200 |
commit | 7ac1a943b824d8624d16397fd4f8a5fa17a7dd9b (patch) | |
tree | 6ab2b89e729724dc00d194ddbec9f73873ed7c43 /tests/auto/quick | |
parent | 8017cf63505f7ed477c658634ec882a12d3b3ddc (diff) |
Add optional width and height arguments to mapToItem()/mapFromItem()
When specifying the width and height from QML, mapToItem()/mapFromItem()
will use QQuickItem::mapRectToItem (and mapRectFromItem).
Task-number: QTBUG-25755
Change-Id: Iae87671913623969d7428dd008afaa6faf3faf33
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/quick')
-rw-r--r-- | tests/auto/quick/qquickitem2/data/mapCoordinatesRect.qml | 85 | ||||
-rw-r--r-- | tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 67 |
2 files changed, 152 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickitem2/data/mapCoordinatesRect.qml b/tests/auto/quick/qquickitem2/data/mapCoordinatesRect.qml new file mode 100644 index 0000000000..4742e93fb9 --- /dev/null +++ b/tests/auto/quick/qquickitem2/data/mapCoordinatesRect.qml @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +Item { + id: root; objectName: "root" + width: 200; height: 200 + + Item { id: itemA; objectName: "itemA"; x: 50; y: 50; width: 25; height: 70 } + + Item { + x: 50; y: 50 + rotation: 45 + Item { id: itemB; objectName: "itemB"; x: 100; y: 100; width: 30; height: 45 } + } + + function mapAToB(x, y, w, h) { + var pos = itemA.mapToItem(itemB, x, y, w, h) + return Qt.rect(pos.x, pos.y, pos.width, pos.height) + } + + function mapAFromB(x, y, w, h) { + var pos = itemA.mapFromItem(itemB, x, y, w, h) + return Qt.rect(pos.x, pos.y, pos.width, pos.height) + } + + function mapAToNull(x, y, w, h) { + var pos = itemA.mapToItem(null, x, y, w, h) + return Qt.rect(pos.x, pos.y, pos.width, pos.height) + } + + function mapAFromNull(x, y, w, h) { + var pos = itemA.mapFromItem(null, x, y, w, h) + return Qt.rect(pos.x, pos.y, pos.width, pos.height) + } + + function checkMapAToInvalid(x, y, w, h) { + var pos = itemA.mapToItem(1122, x, y, w, h) + return pos == undefined; + } + + function checkMapAFromInvalid(x, y, w, h) { + var pos = itemA.mapFromItem(1122, x, y, w, h) + return pos == undefined; + } +} diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index 44b05586ce..f4e5108894 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -77,6 +77,8 @@ private slots: void clip(); void mapCoordinates(); void mapCoordinates_data(); + void mapCoordinatesRect(); + void mapCoordinatesRect_data(); void propertyChanges(); void transforms(); void transforms_data(); @@ -1083,6 +1085,71 @@ void tst_QQuickItem::mapCoordinates_data() QTest::newRow(QTest::toString(i)) << i << i; } +void tst_QQuickItem::mapCoordinatesRect() +{ + QFETCH(int, x); + QFETCH(int, y); + QFETCH(int, width); + QFETCH(int, height); + + QQuickView *canvas = new QQuickView(0); + canvas->setBaseSize(QSize(300, 300)); + canvas->setSource(testFileUrl("mapCoordinatesRect.qml")); + canvas->show(); + qApp->processEvents(); + + QQuickItem *root = qobject_cast<QQuickItem*>(canvas->rootObject()); + QVERIFY(root != 0); + QQuickItem *a = findItem<QQuickItem>(canvas->rootObject(), "itemA"); + QVERIFY(a != 0); + QQuickItem *b = findItem<QQuickItem>(canvas->rootObject(), "itemB"); + QVERIFY(b != 0); + + QVariant result; + + QVERIFY(QMetaObject::invokeMethod(root, "mapAToB", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QCOMPARE(result.value<QRectF>(), qobject_cast<QQuickItem*>(a)->mapRectToItem(b, QRectF(x, y, width, height))); + + QVERIFY(QMetaObject::invokeMethod(root, "mapAFromB", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QCOMPARE(result.value<QRectF>(), qobject_cast<QQuickItem*>(a)->mapRectFromItem(b, QRectF(x, y, width, height))); + + QVERIFY(QMetaObject::invokeMethod(root, "mapAToNull", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QCOMPARE(result.value<QRectF>(), qobject_cast<QQuickItem*>(a)->mapRectToScene(QRectF(x, y, width, height))); + + QVERIFY(QMetaObject::invokeMethod(root, "mapAFromNull", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QCOMPARE(result.value<QRectF>(), qobject_cast<QQuickItem*>(a)->mapRectFromScene(QRectF(x, y, width, height))); + + QString warning1 = testFileUrl("mapCoordinatesRect.qml").toString() + ":48:5: QML Item: mapToItem() given argument \"1122\" which is neither null nor an Item"; + QString warning2 = testFileUrl("mapCoordinatesRect.qml").toString() + ":48:5: QML Item: mapFromItem() given argument \"1122\" which is neither null nor an Item"; + + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); + QVERIFY(QMetaObject::invokeMethod(root, "checkMapAToInvalid", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QVERIFY(result.toBool()); + + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); + QVERIFY(QMetaObject::invokeMethod(root, "checkMapAFromInvalid", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QVERIFY(result.toBool()); + + delete canvas; +} + +void tst_QQuickItem::mapCoordinatesRect_data() +{ + QTest::addColumn<int>("x"); + QTest::addColumn<int>("y"); + QTest::addColumn<int>("width"); + QTest::addColumn<int>("height"); + + for (int i=-20; i<=20; i+=5) + QTest::newRow(QTest::toString(i)) << i << i << i << i; +} + void tst_QQuickItem::transforms_data() { QTest::addColumn<QByteArray>("qml"); |