1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QListview: PageDown/Up infinite loop

Browse Source 
When item.height > viewport.height, the next item is not found
correctly, resulting in an infinite loop.

In this case, move directly to the next item.

Change-Id: I67a40a079ca9dd9189bf84ae550758c685b83d75
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 551127209e6c45fcbbd176a65ad425c47c9bc09c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tang Haixiang 2022-06-27 15:28:09 +08:00 committed by Qt Cherry-pick Bot
parent f417af638f
commit 4795514230
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1201,6 +1201,9 @@ QModelIndex QListView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
} }
return d->closestIndex(initialRect, intersectVector); return d->closestIndex(initialRect, intersectVector);
case MovePageUp: { case MovePageUp: {
if (rect.height() >= d->viewport->height())
return moveCursor(QAbstractItemView::MoveUp, modifiers);
rect.moveTop(rect.top() - d->viewport->height() + 1); rect.moveTop(rect.top() - d->viewport->height() + 1);
if (rect.top() < rect.height()) { if (rect.top() < rect.height()) {
rect.setTop(0); rect.setTop(0);
@ -1242,6 +1245,9 @@ QModelIndex QListView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
} }
return d->closestIndex(initialRect, intersectVector); return d->closestIndex(initialRect, intersectVector);
case MovePageDown: { case MovePageDown: {
if (rect.height() >= d->viewport->height())
return moveCursor(QAbstractItemView::MoveDown, modifiers);
rect.moveTop(rect.top() + d->viewport->height() - 1); rect.moveTop(rect.top() + d->viewport->height() - 1);
if (rect.bottom() > contents.height() - rect.height()) { if (rect.bottom() > contents.height() - rect.height()) {
rect.setTop(contents.height() - 1); rect.setTop(contents.height() - 1);

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

@ -88,6 +88,7 @@ private slots:
void moveCursor2(); void moveCursor2();
void moveCursor3(); void moveCursor3();
void moveCursor4(); void moveCursor4();
void moveCursor5();
void indexAt(); void indexAt();
void clicked(); void clicked();
void singleSelectionRemoveRow(); void singleSelectionRemoveRow();
@ -608,6 +609,26 @@ void tst_QListView::moveCursor4()
QTRY_COMPARE(idx, model.index(actualIndex - 2, 0)); QTRY_COMPARE(idx, model.index(actualIndex - 2, 0));
} }
void tst_QListView::moveCursor5()
{
PublicListView listView;;
QStandardItemModel model;
QIcon icon(QPixmap(300,300));
model.appendRow(new QStandardItem(icon,"11"));
model.appendRow(new QStandardItem(icon,"22"));
model.appendRow(new QStandardItem(icon,"33"));
listView.setModel(&model);
listView.setGeometry(10,10,200,200);
listView.setIconSize(QSize(300,300));
listView.setViewMode(QListView::IconMode);
listView.setCurrentIndex(model.index(0, 0));
QModelIndex idx = listView.moveCursor(PublicListView::MovePageDown, Qt::NoModifier);
QTRY_COMPARE(idx, model.index(1, 0));
idx = listView.moveCursor(PublicListView::MovePageUp, Qt::NoModifier);
QTRY_COMPARE(idx, model.index(0, 0));
}
class QListViewShowEventListener : public QListView class QListViewShowEventListener : public QListView
{ {
Q_OBJECT Q_OBJECT