diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 11:42:24 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-23 13:23:59 +0000 |
commit | d24e8b312026510937e9d07f72aea1083d12f73a (patch) | |
tree | 991cc657c0a33c8628b86c4f8f94c2d04e0d99e5 /tests/auto/focus | |
parent | dfc9a12fc070dc36c67960dfc56d47c6656316ec (diff) |
Set "strong" focus policy for buttons and sliders
Except item delegates, so they won't steal focus from the parent
view (ListView) or control (ComboBox).
NOTE: RangeSlider must be handled as a special case, because
focus must go to the handle which is interacted with.
Change-Id: Ie1aa8bb9b561e6242e373ec9fe874e3aaeacd16a
Task-number: QTBUG-51796
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests/auto/focus')
-rw-r--r-- | tests/auto/focus/tst_focus.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/focus/tst_focus.cpp b/tests/auto/focus/tst_focus.cpp index 1a98f8ee..8f79d659 100644 --- a/tests/auto/focus/tst_focus.cpp +++ b/tests/auto/focus/tst_focus.cpp @@ -124,7 +124,7 @@ void tst_focus::policy() { QQmlEngine engine; QQmlComponent component(&engine); - component.setData("import QtQuick.Controls 2.0; ApplicationWindow { width: 100; height: 100; Button { anchors.fill: parent } }", QUrl()); + component.setData("import QtQuick.Controls 2.0; ApplicationWindow { width: 100; height: 100; Control { anchors.fill: parent } }", QUrl()); QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(component.create())); QVERIFY(window); @@ -161,6 +161,7 @@ void tst_focus::policy() QVERIFY(!control->hasActiveFocus()); // Qt::ClickFocus + control->setAcceptedMouseButtons(Qt::LeftButton); QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(control->width() / 2, control->height() / 2)); QVERIFY(!control->hasActiveFocus()); QVERIFY(!control->hasActiveKeyFocus()); |