aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/quickwidgets/qquickwidget.cpp22
-rw-r--r--src/quickwidgets/qquickwidget.h1
-rw-r--r--tests/auto/quickwidgets/qquickwidget/data/activeFocusOnTab.qml60
-rw-r--r--tests/auto/quickwidgets/qquickwidget/data/noActiveFocusOnTab.qml57
-rw-r--r--tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp40
5 files changed, 179 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index 6f3b685974..920b400eac 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -485,6 +485,12 @@ QImage QQuickWidgetPrivate::grabFramebuffer()
compatible however and attempting to construct a QQuickWidget will lead to
problems.
+ \section1 Tab Key Handling
+
+ On press of the \c[TAB] key, the item inside the QQuickWidget gets focus. If
+ this item can handle \c[TAB] key press, focus will change accordingly within
+ the item, otherwise the next widget in the focus chain gets focus.
+
\sa {Exposing Attributes of C++ Types to QML}, {Qt Quick Widgets Example}, QQuickView
*/
@@ -1222,6 +1228,22 @@ void QQuickWidget::resizeEvent(QResizeEvent *e)
}
/*! \reimp */
+bool QQuickWidget::focusNextPrevChild(bool next)
+{
+ Q_D(QQuickWidget);
+ QKeyEvent event(QEvent::KeyPress, next ? Qt::Key_Tab : Qt::Key_Backtab, Qt::NoModifier);
+ Q_QUICK_INPUT_PROFILE(QQuickProfiler::Key, QQuickProfiler::InputKeyPress, event.key(),
+ Qt::NoModifier);
+ QCoreApplication::sendEvent(d->offscreenWindow, &event);
+
+ QKeyEvent releaseEvent(QEvent::KeyRelease, next ? Qt::Key_Tab : Qt::Key_Backtab, Qt::NoModifier);
+ Q_QUICK_INPUT_PROFILE(QQuickProfiler::Key, QQuickProfiler::InputKeyRelease, releaseEvent.key(),
+ Qt::NoModifier);
+ QCoreApplication::sendEvent(d->offscreenWindow, &releaseEvent);
+ return event.isAccepted();
+}
+
+/*! \reimp */
void QQuickWidget::keyPressEvent(QKeyEvent *e)
{
Q_D(QQuickWidget);
diff --git a/src/quickwidgets/qquickwidget.h b/src/quickwidgets/qquickwidget.h
index 3ddb0613ad..5543705f13 100644
--- a/src/quickwidgets/qquickwidget.h
+++ b/src/quickwidgets/qquickwidget.h
@@ -143,6 +143,7 @@ protected:
bool event(QEvent *) override;
void paintEvent(QPaintEvent *event) override;
+ bool focusNextPrevChild(bool next) override;
private:
Q_DISABLE_COPY(QQuickWidget)
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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 10:21:32 +0000