Merge pull request #3195 from martinvanzijl/browser-up-button-improvement

Improve Browser up button
This commit is contained in:
Rodney 2020-03-31 00:39:47 -05:00 committed by GitHub
commit a2bc1bb110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2196,7 +2196,14 @@ void FileBrowser::refresh() {
void FileBrowser::folderUp() {
QModelIndex index = m_folderTreeView->currentIndex();
if (!index.isValid() || !index.parent().isValid()) return;
if (!index.isValid() || !index.parent().isValid()) {
// cannot go up tree view, so try going to parent directory
TFilePath parentFp = m_folder.getParentDir();
if (parentFp != TFilePath("") && parentFp != m_folder) {
setFolder(parentFp, true);
}
return;
}
m_folderTreeView->setCurrentIndex(index.parent());
m_folderTreeView->scrollTo(index.parent());
}