diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-10-08 12:48:06 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-10-14 11:58:33 +0000 |
commit | 090db511a36464c78f11df3b6596a56f09986951 (patch) | |
tree | 389bf7e9b04fa6cf7dfbc035e9568b98cf7b8e44 /tests/auto/activeFocusOnTab | |
parent | b5b6fc732bb7a09996c06b1df3b71cf2548b0d7c (diff) |
Add RangeSlider
This is basically Slider, except with two handles.
It's used to specify a range of values.
Task-number: QTBUG-48667
Change-Id: Ib4f9afe5dc8343e307610943d338a2b574a01e4d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'tests/auto/activeFocusOnTab')
-rw-r--r-- | tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml | 4 | ||||
-rw-r--r-- | tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp | 44 |
2 files changed, 46 insertions, 2 deletions
diff --git a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml index 05cb464b..5ab0191e 100644 --- a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml +++ b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml @@ -127,6 +127,10 @@ Item { } } } + RangeSlider { + id: rangeslider + objectName: "rangeslider" + } // ScrollBar ScrollIndicator { id: scrollindicator diff --git a/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp b/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp index 79532b45..88607514 100644 --- a/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp +++ b/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp @@ -162,7 +162,27 @@ void tst_activeFocusOnTab::allControls() QVERIFY(item); QVERIFY(item->hasActiveFocus()); - // Tab: radiobutton2->slider + // Tab: radiobutton2->rangeslider.first.handle + key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + + item = findItem<QQuickItem>(window->rootObject(), "rangeslider"); + QVERIFY(item); + item = item->property("first").value<QObject*>()->property("handle").value<QQuickItem*>(); + QVERIFY(item->hasActiveFocus()); + + // Tab: rangeslider.first.handle->rangeslider.second.handle + key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + + item = findItem<QQuickItem>(window->rootObject(), "rangeslider"); + QVERIFY(item); + item = item->property("second").value<QObject*>()->property("handle").value<QQuickItem*>(); + QVERIFY(item->hasActiveFocus()); + + // Tab: rangeslider.second.handle->slider key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); QGuiApplication::sendEvent(window, &key); QVERIFY(key.isAccepted()); @@ -279,7 +299,27 @@ void tst_activeFocusOnTab::allControls() QVERIFY(item); QVERIFY(item->hasActiveFocus()); - // BackTab: slider->radiobutton2 + // BackTab: slider->rangeslider.second.handle + key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + + item = findItem<QQuickItem>(window->rootObject(), "rangeslider"); + QVERIFY(item); + item = item->property("second").value<QObject*>()->property("handle").value<QQuickItem*>(); + QVERIFY(item->hasActiveFocus()); + + // BackTab: rangeslider.second.handle->rangeslider.first.handle + key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + + item = findItem<QQuickItem>(window->rootObject(), "rangeslider"); + QVERIFY(item); + item = item->property("first").value<QObject*>()->property("handle").value<QQuickItem*>(); + QVERIFY(item->hasActiveFocus()); + + // BackTab: rangeslider.first.handle->radiobutton2 key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); QGuiApplication::sendEvent(window, &key); QVERIFY(key.isAccepted()); |