diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-10-04 13:11:30 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 22:23:30 +0200 |
commit | c66b7cf55b6913dcf33d49d4f6bf9db51ccf39a8 (patch) | |
tree | 430983856f993de5618aa5d8d0198b2db98eda97 /tests/auto/qscreen | |
parent | 090d825e1d853a2ed875329a8350b0a727c3527e (diff) |
Added Orientation API to QScreen and QWindow.
QScreen now has a primary and current orientation, and a QWindow can set
its orientation as well. The current screen orientation is just a hint
to the application.
Change-Id: I4635982cfac2d16634d4edd5c6ab78e9d0ac55a4
Reviewed-on: http://codereview.qt-project.org/5988
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/qscreen')
-rw-r--r-- | tests/auto/qscreen/qscreen.pro | 6 | ||||
-rw-r--r-- | tests/auto/qscreen/tst_qscreen.cpp | 169 |
2 files changed, 175 insertions, 0 deletions
diff --git a/tests/auto/qscreen/qscreen.pro b/tests/auto/qscreen/qscreen.pro new file mode 100644 index 0000000000..25d730aae4 --- /dev/null +++ b/tests/auto/qscreen/qscreen.pro @@ -0,0 +1,6 @@ +load(qttest_p4) + +QT += core-private gui-private + +SOURCES += tst_qscreen.cpp + diff --git a/tests/auto/qscreen/tst_qscreen.cpp b/tests/auto/qscreen/tst_qscreen.cpp new file mode 100644 index 0000000000..98ca031116 --- /dev/null +++ b/tests/auto/qscreen/tst_qscreen.cpp @@ -0,0 +1,169 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** 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$ +** +****************************************************************************/ + +#include <qscreen.h> + +#include <QtTest/QtTest> + +#include "../../shared/util.h" + +class tst_QScreen: public QObject +{ + Q_OBJECT + +private slots: + void angleBetween_data(); + void angleBetween(); + void transformBetween_data(); + void transformBetween(); +}; + +void tst_QScreen::angleBetween_data() +{ + QTest::addColumn<uint>("oa"); + QTest::addColumn<uint>("ob"); + QTest::addColumn<int>("expected"); + + QTest::newRow("Portrait Portrait") + << uint(Qt::PortraitOrientation) + << uint(Qt::PortraitOrientation) + << 0; + + QTest::newRow("Portrait Landscape") + << uint(Qt::PortraitOrientation) + << uint(Qt::LandscapeOrientation) + << 270; + + QTest::newRow("Portrait InvertedPortrait") + << uint(Qt::PortraitOrientation) + << uint(Qt::InvertedPortraitOrientation) + << 180; + + QTest::newRow("Portrait InvertedLandscape") + << uint(Qt::PortraitOrientation) + << uint(Qt::InvertedLandscapeOrientation) + << 90; + + QTest::newRow("InvertedLandscape InvertedPortrait") + << uint(Qt::InvertedLandscapeOrientation) + << uint(Qt::InvertedPortraitOrientation) + << 90; + + QTest::newRow("InvertedLandscape Landscape") + << uint(Qt::InvertedLandscapeOrientation) + << uint(Qt::LandscapeOrientation) + << 180; +} + +void tst_QScreen::angleBetween() +{ + QFETCH( uint, oa ); + QFETCH( uint, ob ); + QFETCH( int, expected ); + + Qt::ScreenOrientation a = Qt::ScreenOrientation(oa); + Qt::ScreenOrientation b = Qt::ScreenOrientation(ob); + + QCOMPARE(QScreen::angleBetween(a, b), expected); + QCOMPARE(QScreen::angleBetween(b, a), (360 - expected) % 360); +} + +void tst_QScreen::transformBetween_data() +{ + QTest::addColumn<uint>("oa"); + QTest::addColumn<uint>("ob"); + QTest::addColumn<QRect>("rect"); + QTest::addColumn<QTransform>("expected"); + + QRect rect(0, 0, 480, 640); + + QTest::newRow("Portrait Portrait") + << uint(Qt::PortraitOrientation) + << uint(Qt::PortraitOrientation) + << rect + << QTransform(); + + QTest::newRow("Portrait Landscape") + << uint(Qt::PortraitOrientation) + << uint(Qt::LandscapeOrientation) + << rect + << QTransform(0, -1, 1, 0, 0, rect.height()); + + QTest::newRow("Portrait InvertedPortrait") + << uint(Qt::PortraitOrientation) + << uint(Qt::InvertedPortraitOrientation) + << rect + << QTransform(-1, 0, 0, -1, rect.width(), rect.height()); + + QTest::newRow("Portrait InvertedLandscape") + << uint(Qt::PortraitOrientation) + << uint(Qt::InvertedLandscapeOrientation) + << rect + << QTransform(0, 1, -1, 0, rect.width(), 0); + + QTest::newRow("InvertedLandscape InvertedPortrait") + << uint(Qt::InvertedLandscapeOrientation) + << uint(Qt::InvertedPortraitOrientation) + << rect + << QTransform(0, 1, -1, 0, rect.width(), 0); + + QTest::newRow("InvertedLandscape Landscape") + << uint(Qt::InvertedLandscapeOrientation) + << uint(Qt::LandscapeOrientation) + << rect + << QTransform(-1, 0, 0, -1, rect.width(), rect.height()); +} + +void tst_QScreen::transformBetween() +{ + QFETCH( uint, oa ); + QFETCH( uint, ob ); + QFETCH( QRect, rect ); + QFETCH( QTransform, expected ); + + Qt::ScreenOrientation a = Qt::ScreenOrientation(oa); + Qt::ScreenOrientation b = Qt::ScreenOrientation(ob); + + QCOMPARE(QScreen::transformBetween(a, b, rect), expected); +} + +#include <tst_qscreen.moc> +QTEST_MAIN(tst_QScreen); |