AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a QListViewItem width when spacing is set

Browse Source 
The listitem width was calculated incorrectly because spacing was
not considered. This fixes the second part of the reported bug where
spacing is set. Added some tests to catch the issue relating to the
reported bug.

Also added a test to check spacing in general.

Task-number: QTBUG-21804
Change-Id: Icc6326bce914264d882a60a9fc0ebe7d2a08dbf6
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Jani Honkonen 2012-08-16 16:08:35 +03:00 committed by Qt by Nokia
parent d4385e48b8
commit d2bba5e553
2 changed files with 97 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/itemviews/qlistview.cpp
View File

@ -2274,7 +2274,7 @@ QListViewItem QListModeViewBase::indexToListViewItem(const QModelIndex &index) c
: segmentPositions.at(segment + 1)); : segmentPositions.at(segment + 1));
size.setWidth(right - pos.x()); size.setWidth(right - pos.x());
} else { // make the items as wide as the viewport } else { // make the items as wide as the viewport
size.setWidth(qMax(size.width(), viewport()->width())); size.setWidth(qMax(size.width(), viewport()->width() - 2 * spacing()));
} }
} }

119
tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
View File

@ -138,6 +138,8 @@ private slots:
void draggablePaintPairs(); void draggablePaintPairs();
void taskQTBUG_21804_hiddenItemsAndScrollingWithKeys_data(); void taskQTBUG_21804_hiddenItemsAndScrollingWithKeys_data();
void taskQTBUG_21804_hiddenItemsAndScrollingWithKeys(); void taskQTBUG_21804_hiddenItemsAndScrollingWithKeys();
void spacing_data();
void spacing();
}; };
// Testing get/set functions // Testing get/set functions
@ -2161,13 +2163,93 @@ void tst_QListView::draggablePaintPairs()
void tst_QListView::taskQTBUG_21804_hiddenItemsAndScrollingWithKeys_data() void tst_QListView::taskQTBUG_21804_hiddenItemsAndScrollingWithKeys_data()
{ {
QTest::addColumn<int>("flow"); QTest::addColumn<int>("flow");
QTest::newRow("flow TopToBottom") << static_cast<int>(QListView::TopToBottom); QTest::addColumn<int>("spacing");
QTest::newRow("flow LeftToRight") << static_cast<int>(QListView::LeftToRight); QTest::newRow("flow TopToBottom no spacing") << static_cast<int>(QListView::TopToBottom) << 0;
QTest::newRow("flow TopToBottom with spacing") << static_cast<int>(QListView::TopToBottom) << 5;
QTest::newRow("flow LeftToRight no spacing") << static_cast<int>(QListView::LeftToRight) << 0;
QTest::newRow("flow LeftToRight with spacing") << static_cast<int>(QListView::LeftToRight) << 5;
} }
void tst_QListView::taskQTBUG_21804_hiddenItemsAndScrollingWithKeys() void tst_QListView::taskQTBUG_21804_hiddenItemsAndScrollingWithKeys()
{ {
QFETCH(int, flow); QFETCH(int, flow);
QFETCH(int, spacing);
// 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.setSpacing(spacing);
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
int visibleItemCount = model.rowCount()/2;
for (int i = 0; i < visibleItemCount; 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 < visibleItemCount; 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())));
}
// scroll forward only half way
for (int i = 0; i < visibleItemCount/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 again
for (int i = 0; i < visibleItemCount/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())));
}
}
void tst_QListView::spacing_data()
{
QTest::addColumn<int>("flow");
QTest::addColumn<int>("spacing");
QTest::newRow("flow=TopToBottom spacing=0") << static_cast<int>(QListView::TopToBottom) << 0;
QTest::newRow("flow=TopToBottom spacing=10") << static_cast<int>(QListView::TopToBottom) << 10;
QTest::newRow("flow=LeftToRight spacing=0") << static_cast<int>(QListView::LeftToRight) << 0;
QTest::newRow("flow=LeftToRight spacing=10") << static_cast<int>(QListView::LeftToRight) << 10;
}
void tst_QListView::spacing()
{
QFETCH(int, flow);
QFETCH(int, spacing);
// create some items to show // create some items to show
QStringListModel model; QStringListModel model;
@ -2180,33 +2262,24 @@ void tst_QListView::taskQTBUG_21804_hiddenItemsAndScrollingWithKeys()
QListView lv; QListView lv;
lv.setFlow(static_cast<QListView::Flow>(flow)); lv.setFlow(static_cast<QListView::Flow>(flow));
lv.setModel(&model); lv.setModel(&model);
lv.setSpacing(spacing);
lv.show(); lv.show();
QTest::qWaitForWindowShown(&lv); QTest::qWaitForWindowShown(&lv);
// hide every odd number row // check size and position of first two items
for (int i = 1; i < model.rowCount(); i+=2) QRect item1 = lv.visualRect(lv.model()->index(0, 0));
lv.setRowHidden(i, true); QRect item2 = lv.visualRect(lv.model()->index(1, 0));
QCOMPARE(item1.topLeft(), QPoint(flow == QListView::TopToBottom ? spacing : 0, spacing));
// scroll forward and check that selected item is visible always if (flow == QListView::TopToBottom) {
for (int i = 0; i < model.rowCount()/2; i++) { QCOMPARE(item1.width(), lv.viewport()->width() - 2 * spacing);
if (flow == QListView::TopToBottom) QCOMPARE(item2.topLeft(), QPoint(spacing, spacing + item1.height() + 2 * spacing));
QTest::keyClick(&lv, Qt::Key_Down);
else
QTest::keyClick(&lv, Qt::Key_Right);
QTest::qWait(100);
QVERIFY(lv.rect().contains(lv.visualRect(lv.currentIndex())));
} }
else { // QListView::LeftToRight
// scroll backward QCOMPARE(item1.height(), lv.viewport()->height() - 2 * spacing);
for (int i = 0; i < model.rowCount()/2; i++) { QCOMPARE(item2.topLeft(), QPoint(spacing + item1.width() + spacing, spacing));
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) QTEST_MAIN(tst_QListView)
#include "tst_qlistview.moc" #include "tst_qlistview.moc"