diff options
author | Jani Honkonen <jani.honkonen@digia.com> | 2012-08-01 14:55:51 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-19 08:51:57 +0200 |
commit | d4385e48b8566a5587048a3c6d8b2396ba587ed5 (patch) | |
tree | 63f0a0d5ddf344025d4b1eb3381334599a3b808c /tests/auto/widgets/itemviews/qlistview | |
parent | f20472efa7e4a80b5aa1df3b98778b92cf339220 (diff) |
Fix QListWidget scrolling with keys when there are hidden items
If the selected item is scrolled with keyboard keys the selected item
will go outside the visible area. The scrolling did not take hidden
items into account when calculating the amount to be scrolled.
Task-number: QTBUG-21804
Change-Id: I63da0248cec43be464898f9dc8167e739f00ccd0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/widgets/itemviews/qlistview')
-rw-r--r-- | tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index 507a5f3308..53a8f2b41e 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -136,6 +136,8 @@ private slots: void taskQTBUG_21115_scrollToAndHiddenItems(); void draggablePaintPairs_data(); void draggablePaintPairs(); + void taskQTBUG_21804_hiddenItemsAndScrollingWithKeys_data(); + void taskQTBUG_21804_hiddenItemsAndScrollingWithKeys(); }; // Testing get/set functions @@ -2156,6 +2158,55 @@ void tst_QListView::draggablePaintPairs() } } +void tst_QListView::taskQTBUG_21804_hiddenItemsAndScrollingWithKeys_data() +{ + QTest::addColumn<int>("flow"); + QTest::newRow("flow TopToBottom") << static_cast<int>(QListView::TopToBottom); + QTest::newRow("flow LeftToRight") << static_cast<int>(QListView::LeftToRight); +} + +void tst_QListView::taskQTBUG_21804_hiddenItemsAndScrollingWithKeys() +{ + QFETCH(int, flow); + + // create some items to show + QStringListModel model; + QStringList list; + for (int i = 0; i < 60; i++) + list << QString::number(i); + model.setStringList(list); + + // create listview + QListView lv; + lv.setFlow(static_cast<QListView::Flow>(flow)); + lv.setModel(&model); + lv.show(); + QTest::qWaitForWindowShown(&lv); + + // hide every odd number row + for (int i = 1; i < model.rowCount(); i+=2) + lv.setRowHidden(i, true); + + // scroll forward and check that selected item is visible always + for (int i = 0; i < model.rowCount()/2; i++) { + if (flow == QListView::TopToBottom) + QTest::keyClick(&lv, Qt::Key_Down); + else + QTest::keyClick(&lv, Qt::Key_Right); + QTest::qWait(100); + QVERIFY(lv.rect().contains(lv.visualRect(lv.currentIndex()))); + } + + // scroll backward + for (int i = 0; i < model.rowCount()/2; i++) { + if (flow == QListView::TopToBottom) + QTest::keyClick(&lv, Qt::Key_Up); + else + QTest::keyClick(&lv, Qt::Key_Left); + QTest::qWait(100); + QVERIFY(lv.rect().contains(lv.visualRect(lv.currentIndex()))); + } +} QTEST_MAIN(tst_QListView) #include "tst_qlistview.moc" |