library: add direct focus controls

mixxxdj · Oct 8, 2021 · 069e1f0 · 069e1f0
1 parent 40a0d2b
commit 069e1f0
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/library/librarycontrol.cpp b/src/library/librarycontrol.cpp
@@ -125,6 +125,11 @@ LibraryControl::LibraryControl(Library* pLibrary)
     m_pMoveFocusForward = std::make_unique<ControlPushButton>(ConfigKey("[Library]", "MoveFocusForward"));
     m_pMoveFocusBackward = std::make_unique<ControlPushButton>(ConfigKey("[Library]", "MoveFocusBackward"));
     m_pMoveFocus = std::make_unique<ControlEncoder>(ConfigKey("[Library]", "MoveFocus"), false);
+    m_pFocusLibraryView = std::make_unique<ControlPushButton>(
+            ConfigKey("[Library]", "FocusLibraryView"));
+    m_pFocusSidebar = std::make_unique<ControlPushButton>(ConfigKey("[Library]", "FocusSidebar"));
+    m_pFocusSearchbar = std::make_unique<ControlPushButton>(
+            ConfigKey("[Library]", "FocusSearchbar"));
     connect(m_pMoveFocusForward.get(),
             &ControlPushButton::valueChanged,
             this,
@@ -137,6 +142,18 @@ LibraryControl::LibraryControl(Library* pLibrary)
             &ControlEncoder::valueChanged,
             this,
             &LibraryControl::slotMoveFocus);
+    connect(m_pFocusLibraryView.get(),
+            &ControlEncoder::valueChanged,
+            this,
+            &LibraryControl::setLibraryFocus);
+    connect(m_pFocusSidebar.get(),
+            &ControlEncoder::valueChanged,
+            this,
+            &LibraryControl::setSidebarFocus);
+    connect(m_pFocusSearchbar.get(),
+            &ControlEncoder::valueChanged,
+            this,
+            &LibraryControl::setSearchbarFocus);
 
     // Control to "goto" the currently selected item in focused widget (context dependent)
     m_pGoToItem = std::make_unique<ControlPushButton>(ConfigKey("[Library]", "GoToItem"));
@@ -406,8 +423,6 @@ void LibraryControl::bindSearchboxWidget(WSearchLineEdit* pSearchbox) {
             &LibraryControl::searchboxWidgetDeleted);
 }
 
-
-
 void LibraryControl::libraryWidgetDeleted() {
     m_pLibraryWidget = nullptr;
 }
@@ -635,6 +650,20 @@ void LibraryControl::setLibraryFocus() {
     m_pLibraryWidget->getActiveView()->setFocus();
 }
 
+void LibraryControl::setSidebarFocus() {
+    VERIFY_OR_DEBUG_ASSERT(m_pSidebarWidget) {
+        return;
+    }
+    m_pSidebarWidget->setFocus();
+}
+
+void LibraryControl::setSearchbarFocus() {
+    VERIFY_OR_DEBUG_ASSERT(m_pSearchbox) {
+        return;
+    }
+    m_pSearchbox->setFocus();
+}
+
 void LibraryControl::slotSelectSidebarItem(double v) {
     VERIFY_OR_DEBUG_ASSERT(m_pSidebarWidget) {
         return;

diff --git a/src/library/librarycontrol.h b/src/library/librarycontrol.h
@@ -105,6 +105,8 @@ class LibraryControl : public QObject {
     void emitKeyEvent(QKeyEvent&& event);
     // Give the keyboard focus to the main library pane
     void setLibraryFocus();
+    void setSidebarFocus();
+    void setSearchbarFocus();
 
     // Controls to navigate vertically within currently focused widget (up/down buttons)
     std::unique_ptr<ControlPushButton> m_pMoveUp;
@@ -125,6 +127,9 @@ class LibraryControl : public QObject {
     std::unique_ptr<ControlPushButton> m_pMoveFocusForward;
     std::unique_ptr<ControlPushButton> m_pMoveFocusBackward;
     std::unique_ptr<ControlEncoder> m_pMoveFocus;
+    std::unique_ptr<ControlPushButton> m_pFocusLibraryView;
+    std::unique_ptr<ControlPushButton> m_pFocusSidebar;
+    std::unique_ptr<ControlPushButton> m_pFocusSearchbar;
 
     // Control to choose the currently selected item in focused widget (double click)
     std::unique_ptr<ControlObject> m_pGoToItem;