From 0c955b49760519f0a22f07966eb2e27d2e02c6e2 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 22 Aug 2012 16:10:01 +0200 Subject: Fix indexAbove and indexBelow to return indexes in the correct column. They used to always return indexes in column 0. Change-Id: I2cf4239e0a975b37548de00a1deb916fcd88b4c7 Reviewed-by: Marc Mutz Reviewed-by: Stephen Kelly --- src/widgets/itemviews/qtreeview.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index 6b0768bf7a..18c33b68e7 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -1991,7 +1991,8 @@ QModelIndex QTreeView::indexAbove(const QModelIndex &index) const int i = d->viewIndex(index); if (--i < 0) return QModelIndex(); - return d->viewItems.at(i).index; + const QModelIndex firstColumnIndex = d->viewItems.at(i).index; + return firstColumnIndex.sibling(firstColumnIndex.row(), index.column()); } /*! @@ -2006,7 +2007,8 @@ QModelIndex QTreeView::indexBelow(const QModelIndex &index) const int i = d->viewIndex(index); if (++i >= d->viewItems.count()) return QModelIndex(); - return d->viewItems.at(i).index; + const QModelIndex firstColumnIndex = d->viewItems.at(i).index; + return firstColumnIndex.sibling(firstColumnIndex.row(), index.column()); } /*! -- cgit v1.2.3