diff --git a/krusader/Panel/PanelView/krinterview.cpp b/krusader/Panel/PanelView/krinterview.cpp --- a/krusader/Panel/PanelView/krinterview.cpp +++ b/krusader/Panel/PanelView/krinterview.cpp @@ -310,18 +310,16 @@ void KrInterView::preDeleteItem(KrViewItem *item) { + // update selection setSelected(item->getFileItem(), false); - // if the next item is current, current selection is lost on remove; preserve manually - KrViewItem *currentItem = getCurrentKrViewItem(); - KrViewItem *nextCurrentItem = currentItem && currentItem == getNext(item) ? currentItem : nullptr; + // close editor if it's opened for the item + auto file_item = (FileItem *)item->getFileItem(); + _itemView->closePersistentEditor(_model->fileItemIndex(file_item)); - _model->removeItem((FileItem *)item->getFileItem()); - - if (nextCurrentItem) - setCurrentKrViewItem(nextCurrentItem, false); - - _itemHash.remove((FileItem *)item->getFileItem()); + // remove the item from the structures + _model->removeItem(file_item); + _itemHash.remove(file_item); } void KrInterView::prepareForActive() diff --git a/krusader/Panel/PanelView/listmodel.cpp b/krusader/Panel/PanelView/listmodel.cpp --- a/krusader/Panel/PanelView/listmodel.cpp +++ b/krusader/Panel/PanelView/listmodel.cpp @@ -358,31 +358,20 @@ if (rowToRemove < 0) return; - emit layoutAboutToBeChanged(); + beginRemoveRows(QModelIndex(), rowToRemove, rowToRemove); _fileItems.removeAt(rowToRemove); _fileItemNdx.remove(fileItem); _nameNdx.remove(fileItem->getName()); _urlNdx.remove(fileItem->getUrl()); - // update indices for fileItems following fileitem + + // update indices for fileItems following the removed fileitem for (int i = rowToRemove; i < _fileItems.count(); i++) { updateIndices(_fileItems[i], i); } - const QModelIndexList oldPersistentList = persistentIndexList(); - QModelIndexList newPersistentList; - foreach (const QModelIndex &mndx, oldPersistentList) { - int newRow = mndx.row(); - if (newRow > rowToRemove) - newRow--; - if (newRow != rowToRemove) - newPersistentList << index(newRow, mndx.column()); - else - newPersistentList << QModelIndex(); - } - changePersistentIndexList(oldPersistentList, newPersistentList); - emit layoutChanged(); + endRemoveRows(); } QVariant ListModel::headerData(int section, Qt::Orientation orientation, int role) const