diff options
author | Andy Shaw <andy.shaw@qt.io> | 2017-11-01 15:40:14 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-04-11 14:08:53 +0000 |
commit | 996c6d452702162e909285b5be9a831290cff1c9 (patch) | |
tree | a3b429fb44c64ef4374f086659c4dc2e776b7926 /tests/auto/quickwidgets | |
parent | 8780764b274217b256aadd00114a76bdffbdb1ef (diff) |
Pass on tab presses to the offscreen window to handle first
When pressing tab/backtab then the offscreen window needs to pass it on
to the item in case it will handle this for changing focus. If it does
not handle the event, it will pass it back for QWidget handling.
[ChangeLog][QQuickWidget] Tab presses are now passed on to the root
item to be handled first. When not handled by the root item, it will
be handled like a standard QWidget.
Task-number: QTBUG-45641
Change-Id: Ief0552ba496c87ab0b6e12aa8e67ef44b5a20ae2
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'tests/auto/quickwidgets')
3 files changed, 156 insertions, 1 deletions
diff --git a/tests/auto/quickwidgets/qquickwidget/data/activeFocusOnTab.qml b/tests/auto/quickwidgets/qquickwidget/data/activeFocusOnTab.qml new file mode 100644 index 0000000000..9ad1cafed9 --- /dev/null +++ b/tests/auto/quickwidgets/qquickwidget/data/activeFocusOnTab.qml @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 + +Item { + Rectangle { + objectName: "topRect" + x: 0 + width: 50 + height: 50 + activeFocusOnTab: true + focus: true + color: activeFocus ? "green" : "red" + } + Rectangle { + objectName: "middleRect" + x: 50 + width: 50 + height: 50 + focus: true + activeFocusOnTab: true + color: activeFocus ? "green" : "red" + } + Rectangle { + objectName: "bottomRect" + x: 100 + width: 50 + height: 50 + focus: true + activeFocusOnTab: true + color: activeFocus ? "green" : "red" + } +} + diff --git a/tests/auto/quickwidgets/qquickwidget/data/noActiveFocusOnTab.qml b/tests/auto/quickwidgets/qquickwidget/data/noActiveFocusOnTab.qml new file mode 100644 index 0000000000..6d86ce45bb --- /dev/null +++ b/tests/auto/quickwidgets/qquickwidget/data/noActiveFocusOnTab.qml @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 + +Item { + Rectangle { + objectName: "topRect2" + x: 0 + width: 50 + height: 50 + focus: true + color: activeFocus ? "green" : "red" + } + Rectangle { + objectName: "middleRect2" + x: 50 + width: 50 + height: 50 + focus: true + color: activeFocus ? "green" : "red" + } + Rectangle { + objectName: "bottomRect3" + x: 100 + width: 50 + height: 50 + focus: true + color: activeFocus ? "green" : "red" + } +} + diff --git a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp index a97e3c0538..af358925fe 100644 --- a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp +++ b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp @@ -40,7 +40,7 @@ #include <QtQml/qqmlengine.h> #include <QtCore/QLoggingCategory> - +#include <QtGui/qstylehints.h> #include <QtWidgets/QBoxLayout> #include <QtWidgets/QLabel> @@ -140,6 +140,7 @@ private slots: void mouseEventWindowPos(); void synthMouseFromTouch_data(); void synthMouseFromTouch(); + void tabKey(); private: QTouchDevice *device = QTest::createTouchDevice(); @@ -620,6 +621,43 @@ void tst_qquickwidget::synthMouseFromTouch() QCOMPARE(ev.source(), Qt::MouseEventSynthesizedByQt); } +void tst_qquickwidget::tabKey() +{ + if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls) + QSKIP("This function doesn't support NOT iterating all."); + QWidget window1; + QQuickWidget *qqw = new QQuickWidget(&window1); + qqw->setSource(testFileUrl("activeFocusOnTab.qml")); + QQuickWidget *qqw2 = new QQuickWidget(&window1); + qqw2->setSource(testFileUrl("noActiveFocusOnTab.qml")); + qqw2->move(100, 0); + window1.show(); + qqw->setFocus(); + QVERIFY(QTest::qWaitForWindowExposed(&window1, 5000)); + QVERIFY(qqw->hasFocus()); + QQuickItem *item = qobject_cast<QQuickItem *>(qqw->rootObject()); + QQuickItem *topItem = item->findChild<QQuickItem *>("topRect"); + QQuickItem *middleItem = item->findChild<QQuickItem *>("middleRect"); + QQuickItem *bottomItem = item->findChild<QQuickItem *>("bottomRect"); + topItem->forceActiveFocus(); + QVERIFY(topItem->property("activeFocus").toBool()); + QTest::keyClick(qqw, Qt::Key_Tab); + QTRY_VERIFY(middleItem->property("activeFocus").toBool()); + QTest::keyClick(qqw, Qt::Key_Tab); + QTRY_VERIFY(bottomItem->property("activeFocus").toBool()); + QTest::keyClick(qqw, Qt::Key_Backtab); + QTRY_VERIFY(middleItem->property("activeFocus").toBool()); + + qqw2->setFocus(); + QQuickItem *item2 = qobject_cast<QQuickItem *>(qqw2->rootObject()); + QQuickItem *topItem2 = item2->findChild<QQuickItem *>("topRect2"); + QTRY_VERIFY(qqw2->hasFocus()); + QVERIFY(topItem2->property("activeFocus").toBool()); + QTest::keyClick(qqw2, Qt::Key_Tab); + QTRY_VERIFY(qqw->hasFocus()); + QVERIFY(middleItem->property("activeFocus").toBool()); +} + QTEST_MAIN(tst_qquickwidget) #include "tst_qquickwidget.moc" |