Library: add control to open/close the track menu

mixxxdj · Dec 23, 2021 · 797aa84 · 797aa84
1 parent 70bee44
commit 797aa84
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 1 deletion.
diff --git a/src/library/library.cpp b/src/library/library.cpp
@@ -425,6 +425,11 @@ void Library::bindLibraryWidget(
             m_pLibraryControl,
             &LibraryControl::setLibraryFocus);
 
+    connect(m_pLibraryControl,
+            &LibraryControl::showHideTrackMenu,
+            pTrackTableView,
+            &WTrackTableView::slotShowHideTrackMenu);
+
     for (const auto& feature : qAsConst(m_features)) {
         feature->bindLibraryWidget(pLibraryWidget, pKeyboard);
     }

diff --git a/src/library/librarycontrol.cpp b/src/library/librarycontrol.cpp
@@ -302,7 +302,23 @@ LibraryControl::LibraryControl(Library* pLibrary)
                 }
             });
 
-    /// Deprecated controls
+    // Show the track context menu for selected tracks, or hide it
+    // if it is the current active window
+    m_pShowTrackMenu = std::make_unique<ControlPushButton>(
+            ConfigKey("[Library]", "show_track_menu"));
+    connect(m_pShowTrackMenu.get(),
+            &ControlPushButton::valueChanged,
+            this,
+            [this](double value) {
+                VERIFY_OR_DEBUG_ASSERT(m_pLibraryWidget) {
+                    return;
+                }
+                if (value > 0.0) {
+                    emit showHideTrackMenu();
+                }
+            });
+
+    // Deprecated controls
     m_pSelectNextTrack = std::make_unique<ControlPushButton>(ConfigKey("[Playlist]", "SelectNextTrack"));
     connect(m_pSelectNextTrack.get(),
             &ControlPushButton::valueChanged,

diff --git a/src/library/librarycontrol.h b/src/library/librarycontrol.h
@@ -49,6 +49,7 @@ class LibraryControl : public QObject {
 
   signals:
     void clearSearchIfClearButtonHasFocus();
+    void showHideTrackMenu();
 
   public slots:
     // Deprecated navigation slots
@@ -145,6 +146,9 @@ class LibraryControl : public QObject {
     std::unique_ptr<ControlPushButton> m_pTrackColorPrev;
     std::unique_ptr<ControlPushButton> m_pTrackColorNext;
 
+    // Control to show/hide the track menu
+    std::unique_ptr<ControlPushButton> m_pShowTrackMenu;
+
     // Controls to navigate search history
     std::unique_ptr<ControlPushButton> m_pSelectHistoryNext;
     std::unique_ptr<ControlPushButton> m_pSelectHistoryPrev;

diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
@@ -468,6 +468,18 @@ void WTrackTableView::slotUnhide() {
     }
 }
 
+void WTrackTableView::slotShowHideTrackMenu() {
+    VERIFY_OR_DEBUG_ASSERT(m_pTrackMenu.get()) {
+        return;
+    }
+    if (m_pTrackMenu->isActiveWindow()) {
+        m_pTrackMenu->close();
+    } else {
+        QContextMenuEvent event(QContextMenuEvent::Mouse, QCursor::pos());
+        contextMenuEvent(&event);
+    }
+}
+
 void WTrackTableView::contextMenuEvent(QContextMenuEvent* event) {
     VERIFY_OR_DEBUG_ASSERT(m_pTrackMenu.get()) {
         initTrackMenu();

diff --git a/src/widget/wtracktableview.h b/src/widget/wtracktableview.h
@@ -61,6 +61,7 @@ class WTrackTableView : public WLibraryTableView {
     void slotUnhide();
     void slotPurge();
     void slotDeleteTracksFromDisk();
+    void slotShowHideTrackMenu();
 
     void slotAddToAutoDJBottom() override;
     void slotAddToAutoDJTop() override;