From 7ac1a943b824d8624d16397fd4f8a5fa17a7dd9b Mon Sep 17 00:00:00 2001 From: Yann Bodson Date: Wed, 16 May 2012 12:59:32 +1000 Subject: 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 --- .../quick/qquickitem2/data/mapCoordinatesRect.qml | 85 ++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 tests/auto/quick/qquickitem2/data/mapCoordinatesRect.qml (limited to 'tests/auto/quick/qquickitem2/data/mapCoordinatesRect.qml') 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; + } +} -- cgit v1.2.3