iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash when navigating listviews.

Browse Source
This commit is contained in:
craig
2012-02-13 21:04:38 +00:00
parent 68ec5db2bd
commit 4ff83462df
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -40,6 +40,7 @@
31. Use current style for position slider.
32. Fix some toolbutton clipping with some styles.
33. Fix amarok import script.
34. Fix crash when navigating listviews.
0.3.0
-----

13
widgets/itemview.cpp
View File

@@ -619,7 +619,15 @@ void ItemView::backActivated()
setLevel(currentLevel-1);
itemModel->setRootIndex(listView->rootIndex().parent());
listView->setRootIndex(listView->rootIndex().parent());
listView->scrollTo(prevTopIndex, QAbstractItemView::PositionAtTop);
if (qobject_cast<QSortFilterProxyModel *>(listView->model())) {
QModelIndex idx=static_cast<QSortFilterProxyModel *>(listView->model())->mapFromSource(prevTopIndex);
if (idx.isValid()) {
listView->scrollTo(idx, QAbstractItemView::PositionAtTop);
}
} else {
listView->scrollTo(prevTopIndex, QAbstractItemView::PositionAtTop);
}
}
QAction * ItemView::getAction(const QModelIndex &index)
@@ -681,6 +689,9 @@ void ItemView::itemActivated(const QModelIndex &index)
treeView->setExpanded(index, !treeView->isExpanded(index));
} else if (index.isValid() && index.child(0, 0).isValid()) {
prevTopIndex=listView->indexAt(QPoint(0, 0));
if (qobject_cast<QSortFilterProxyModel *>(listView->model())) {
prevTopIndex=static_cast<QSortFilterProxyModel *>(listView->model())->mapToSource(prevTopIndex);
}
setLevel(currentLevel+1, index.child(0, 0).child(0, 0).isValid());
#ifdef ENABLE_KDE_SUPPORT
listSearch->setPlaceholderText(i18n("Search %1...", index.data(Qt::DisplayRole).toString()));