summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
diff options
context:
space:
mode:
authorJani Honkonen <jani.honkonen@digia.com>2012-02-03 15:11:01 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-02-09 15:23:50 (GMT)
commitb0601630dd0ddabfaa3b97d042ee02b981d95988 (patch)
treee0b3c6d329c25b5db751f95fe32614991f687267 /src/gui/itemviews
parenta13b2a248e5091ddf21e3c5ac08c9ddf0b940b5b (diff)
downloadQt-b0601630dd0ddabfaa3b97d042ee02b981d95988.zip
Qt-b0601630dd0ddabfaa3b97d042ee02b981d95988.tar.gz
Qt-b0601630dd0ddabfaa3b97d042ee02b981d95988.tar.bz2
Fix QListView::scrollTo() when there are hidden rows
QListView does not consider hidden rows when scrolling to an item. If there are hidden rows (or columns) before the selected item then the visual index of an item is not the same as the row index from the model. So scrolling will be off by the number of hidden rows before the selected item. Added a autotest for this also. Task-number: QTBUG-21115 Change-Id: I49c39033d83f80d4405b59510617096029ee6d3b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/gui/itemviews')
-rw-r--r--src/gui/itemviews/qlistview.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp
index 34bead3..6b0ea7f 100644
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
@@ -3216,7 +3216,12 @@ int QListView::visualIndex(const QModelIndex &index) const
Q_D(const QListView);
d->executePostedLayout();
QListViewItem itm = d->indexToListViewItem(index);
- return d->commonListView->itemIndex(itm);
+ int visualIndex = d->commonListView->itemIndex(itm);
+ for (int row = 0; row <= index.row() && visualIndex >= 0; row++) {
+ if (d->isHidden(row))
+ visualIndex--;
+ }
+ return visualIndex;
}
QT_END_NAMESPACE