diff options
| author | aavit <qt-info@nokia.com> | 2010-04-08 14:08:00 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-04-08 14:08:00 (GMT) |
| commit | 0d49bd5b518ab4253baf2e30fe6a0c6d2e8651ea (patch) | |
| tree | 797f230b26d1f90dd126b6a25dce2a341784e964 /src/gui/itemviews/qtreeview.cpp | |
| parent | 4a557f79976d7b6cbb1fa35d728cba784dc32a09 (diff) | |
| parent | bf195e57ff96c326fa26c6b3a4f64e26d18fd9bd (diff) | |
| download | Qt-0d49bd5b518ab4253baf2e30fe6a0c6d2e8651ea.zip Qt-0d49bd5b518ab4253baf2e30fe6a0c6d2e8651ea.tar.gz Qt-0d49bd5b518ab4253baf2e30fe6a0c6d2e8651ea.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/itemviews/qtreeview.cpp')
| -rw-r--r-- | src/gui/itemviews/qtreeview.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index d934683..c3ff2bd 100644 --- a/src/gui/itemviews/qtreeview.cpp +++ b/src/gui/itemviews/qtreeview.cpp @@ -3194,12 +3194,16 @@ void QTreeViewPrivate::layout(int i, bool recursiveExpanding, bool afterIsUninit int QTreeViewPrivate::pageUp(int i) const { int index = itemAtCoordinate(coordinateForItem(i) - viewport->height()); + while (isItemHiddenOrDisabled(index)) + index--; return index == -1 ? 0 : index; } int QTreeViewPrivate::pageDown(int i) const { int index = itemAtCoordinate(coordinateForItem(i) + viewport->height()); + while (isItemHiddenOrDisabled(index)) + index++; return index == -1 ? viewItems.count() - 1 : index; } |