WIP Library sidebar: select renamed or neighbour of deleted playlist/…

…crate only if it was selected previously
mixxxdj · Jan 16, 2023 · 6a6a2c3 · 6a6a2c3
1 parent c54a0c9
commit 6a6a2c3
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 17 deletions.
diff --git a/src/library/trackset/baseplaylistfeature.cpp b/src/library/trackset/baseplaylistfeature.cpp
@@ -421,12 +421,6 @@ void BasePlaylistFeature::slotDeletePlaylist() {
         return;
     }
 
-    // we will switch to the sibling if the deleted playlist is currently active
-    bool wasActive = m_pPlaylistTableModel->getPlaylist() == playlistId;
-    // TODO 'active' doesn't mean it was visible, e.g. while the playlist feuture
-    // root view or another feature model is currently loaded in the tracks view
-    qWarning() << "     wasActive:" << wasActive;
-
     VERIFY_OR_DEBUG_ASSERT(playlistId >= 0) {
         return;
     }
@@ -437,7 +431,17 @@ void BasePlaylistFeature::slotDeletePlaylist() {
         return;
     }
 
-    int siblingId = getSiblingPlaylistIdOf(m_lastRightClickedIndex);
+    int siblingId = kInvalidPlaylistId;
+    // If the playlist is currently loaded and shown in the tracks table we will
+    // select a sibling playlist after deletion.
+    // TODO find a better way to detect 'active' than isChildIndexSelected()
+    if (playlistId == m_pPlaylistTableModel->getPlaylist() &&
+            m_pSidebarWidget != nullptr &&
+            // m_pSidebarWidget->isChildIndexSelected(m_lastRightClickedIndex);
+            m_pSidebarWidget->isChildIndexSelected(indexFromPlaylistId(playlistId))) {
+        siblingId = getSiblingPlaylistIdOf(m_lastRightClickedIndex);
+        qWarning() << "     wasActive, get sibling id:" << siblingId;
+    }
 
     QMessageBox::StandardButton btn = QMessageBox::question(nullptr,
             tr("Confirm Deletion"),
@@ -451,13 +455,11 @@ void BasePlaylistFeature::slotDeletePlaylist() {
 
     m_playlistDao.deletePlaylist(playlistId);
 
-    if (siblingId == kInvalidPlaylistId) {
-        return;
-    }
-    if (wasActive) {
+    if (siblingId != kInvalidPlaylistId) {
+        qWarning() << ".";
+        qWarning() << "     Pl delete: was active, activate sibling";
+        qWarning() << ".";
         activatePlaylist(siblingId);
-    } else if (m_pSidebarWidget) {
-        m_pSidebarWidget->selectChildIndex(indexFromPlaylistId(siblingId), false);
     }
 }
 

diff --git a/src/library/trackset/crate/cratefeature.cpp b/src/library/trackset/crate/cratefeature.cpp
@@ -417,7 +417,13 @@ void CrateFeature::slotDeleteCrate() {
         CrateId crateId = crate.getId();
         // Store sibling id to restore selection after crate was deleted
         // to avoid the scroll position being reset to Crate root item.
-        storePrevSiblingCrateId(crateId);
+        m_prevSiblingCrate = CrateId();
+        if (crateId == m_crateTableModel.selectedCrate() &&
+                m_pSidebarWidget &&
+                m_pSidebarWidget->isChildIndexSelected(m_lastRightClickedIndex)) {
+            storePrevSiblingCrateId(crateId);
+        }
+
         QMessageBox::StandardButton btn = QMessageBox::question(nullptr,
                 tr("Confirm Deletion"),
                 tr("Do you really want to delete crate <b>%1</b>?")

diff --git a/src/library/trackset/playlistfeature.cpp b/src/library/trackset/playlistfeature.cpp
@@ -305,8 +305,19 @@ void PlaylistFeature::slotPlaylistTableRenamed(
             type == PlaylistDAO::PLHT_UNKNOWN) { // In case of a deleted Playlist
         clearChildModel();
         m_lastRightClickedIndex = constructChildModel(playlistId);
-        if (type != PlaylistDAO::PLHT_UNKNOWN) {
+        if (type == PlaylistDAO::PLHT_UNKNOWN) {
+            return;
+        }
+
+        // reselect playlist if it was selected previously, i.e. don't activate
+        // if another sidebar item was selected
+        if (playlistId == m_pPlaylistTableModel->getPlaylist() &&
+                m_pSidebarWidget &&
+                m_pSidebarWidget->isChildIndexSelected(
+                        indexFromPlaylistId(playlistId))) {
             activatePlaylist(playlistId);
+        } else {
+            selectPlaylistInSidebar(playlistId, false);
         }
     }
 }

diff --git a/src/library/trackset/setlogfeature.cpp b/src/library/trackset/setlogfeature.cpp
@@ -470,10 +470,14 @@ void SetlogFeature::slotPlaylistTableRenamed(int playlistId, const QString& newN
         clearChildModel();
         m_lastRightClickedIndex = constructChildModel(playlistId);
         if (type != PlaylistDAO::PLHT_UNKNOWN) {
-            if (playlistId == m_pPlaylistTableModel->getPlaylist()) {
+            if (playlistId == m_pPlaylistTableModel->getPlaylist() &&
+                    m_pSidebarWidget &&
+                    m_pSidebarWidget->isChildIndexSelected(
+                            indexFromPlaylistId(playlistId))) {
                 activatePlaylist(playlistId);
             } else if (m_pSidebarWidget) {
-                m_pSidebarWidget->selectChildIndex(indexFromPlaylistId(playlistId), false);
+                // m_pSidebarWidget->selectChildIndex(indexFromPlaylistId(playlistId), false);
+                slotPlaylistTableChangedAndScrollTo(playlistId);
             }
         }
     }