Sidebar: fix item selection after delete, create, rename

src/library/trackset/baseplaylistfeature.cpp

@@ -185,11 +185,11 @@ void BasePlaylistFeature::activateChild(const QModelIndex& index) {
 }
 
 void BasePlaylistFeature::activatePlaylist(int playlistId) {
-    // qDebug() << "BasePlaylistFeature::activatePlaylist()" << playlistId;
     VERIFY_OR_DEBUG_ASSERT(playlistId != kInvalidPlaylistId) {
         return;
     }
     QModelIndex index = indexFromPlaylistId(playlistId);
+    //qDebug() << "BasePlaylistFeature::activatePlaylist()" << playlistId << index;
     VERIFY_OR_DEBUG_ASSERT(index.isValid()) {
         return;
     }

src/library/trackset/crate/cratefeature.cpp

@@ -395,6 +395,8 @@ void CrateFeature::slotDeleteCrate() {
             qWarning() << "Refusing to delete locked crate" << crate;
             return;
         }
+        // TODO Store sibling index to restore selection after crate was deleted
+        // to avoid scroll position reset (to Crate root item)
         if (m_pTrackCollection->deleteCrate(crate.getId())) {
             qDebug() << "Deleted crate" << crate;
             return;

src/widget/wlibrarysidebar.cpp

@@ -212,15 +212,20 @@ void WLibrarySidebar::keyPressEvent(QKeyEvent* event) {
 }
 
 void WLibrarySidebar::selectIndex(const QModelIndex& index) {
+    //qDebug() << "WLibrarySidebar::selectIndex" << index;
+    if (!index.isValid()) {
+        return;
+    }
     auto* pModel = new QItemSelectionModel(model());
     pModel->select(index, QItemSelectionModel::Select);
     if (selectionModel()) {
         selectionModel()->deleteLater();
     }
-    setSelectionModel(pModel);
     if (index.parent().isValid()) {
         expand(index.parent());
     }
+    setSelectionModel(pModel);
+    setCurrentIndex(index);
     scrollTo(index);
 }
 
@@ -232,6 +237,9 @@ void WLibrarySidebar::selectChildIndex(const QModelIndex& index, bool selectItem
         return;
     }
     QModelIndex translated = sidebarModel->translateChildIndex(index);
+    if (!translated.isValid()) {
+        return;
+    }
 
     if (selectItem) {
         auto* pModel = new QItemSelectionModel(sidebarModel);
@@ -240,6 +248,7 @@ void WLibrarySidebar::selectChildIndex(const QModelIndex& index, bool selectItem
             selectionModel()->deleteLater();
         }
         setSelectionModel(pModel);
+        setCurrentIndex(translated);
     }
 
     QModelIndex parentIndex = translated.parent();