Merge pull request #4360 from ronso0/lineedit-focus

pass focus to library after effect, beat size or Auto DJ transition configuration

src/library/autodj/dlgautodj.cpp

@@ -1,5 +1,6 @@
 #include "library/autodj/dlgautodj.h"
 
+#include <QApplication>
 #include <QMessageBox>
 
 #include "library/playlisttablemodel.h"
@@ -160,7 +161,13 @@ DlgAutoDJ::DlgAutoDJ(WLibrary* parent,
     fadeModeCombobox->setFocusPolicy(Qt::ClickFocus);
     spinBoxTransition->setFocusPolicy(Qt::ClickFocus);
     // work around QLineEdit being protected
-    spinBoxTransition->findChild<QLineEdit*>()->setFocusPolicy(Qt::ClickFocus);
+    QLineEdit* lineEditTransition(spinBoxTransition->findChild<QLineEdit*>());
+    lineEditTransition->setFocusPolicy(Qt::ClickFocus);
+    // Catch any Return keypress to pass focus to tracks table
+    connect(lineEditTransition,
+            &QLineEdit::returnPressed,
+            this,
+            &DlgAutoDJ::shiftTabKeypress);
 
     connect(spinBoxTransition,
             QOverload<int>::of(&QSpinBox::valueChanged),
@@ -178,7 +185,7 @@ DlgAutoDJ::DlgAutoDJ(WLibrary* parent,
     fadeModeCombobox->setCurrentIndex(
             fadeModeCombobox->findData(static_cast<int>(m_pAutoDJProcessor->getTransitionMode())));
     connect(fadeModeCombobox,
-            QOverload<int>::of(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::activated),
             this,
             &DlgAutoDJ::slotTransitionModeChanged);
 
@@ -330,9 +337,11 @@ void DlgAutoDJ::autoDJStateChanged(AutoDJProcessor::AutoDJState state) {
     }
 }
 
-void DlgAutoDJ::slotTransitionModeChanged(int comboboxIndex) {
-    m_pAutoDJProcessor->setTransitionMode(static_cast<AutoDJProcessor::TransitionMode>(
-            fadeModeCombobox->itemData(comboboxIndex).toInt()));
+void DlgAutoDJ::slotTransitionModeChanged(int newIndex) {
+    m_pAutoDJProcessor->setTransitionMode(
+            static_cast<AutoDJProcessor::TransitionMode>(
+                    fadeModeCombobox->itemData(newIndex).toInt()));
+    shiftTabKeypress();
 }
 
 void DlgAutoDJ::slotRepeatPlaylistChanged(int checkState) {
@@ -370,3 +379,12 @@ void DlgAutoDJ::updateSelectionInfo() {
 bool DlgAutoDJ::hasFocus() const {
     return m_pTrackTableView->hasFocus();
 }
+
+void DlgAutoDJ::shiftTabKeypress() {
+    // After selecting a mode or editing the transition time, send Shift+Tab
+    // to move focus to the next keyboard-focusable widget (tracks table in
+    // official skins) in order to immediately allow keyboard shortcuts again.
+    QKeyEvent backwardFocusKeyEvent =
+            QKeyEvent{QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier};
+    QApplication::sendEvent(this, &backwardFocusKeyEvent);
+}

src/library/autodj/dlgautodj.h

@@ -56,6 +56,7 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     void setupActionButton(QPushButton* pButton,
             void (DlgAutoDJ::*pSlot)(bool),
             const QString& fallbackText);
+    void shiftTabKeypress();
 
     const UserSettingsPointer m_pConfig;
 

src/widget/wbeatspinbox.cpp

@@ -1,5 +1,6 @@
 #include "widget/wbeatspinbox.h"
 
+#include <QApplication>
 #include <QLineEdit>
 #include <QRegularExpression>
 
@@ -295,6 +296,18 @@ bool WBeatSpinBox::event(QEvent* pEvent) {
     return QDoubleSpinBox::event(pEvent);
 }
 
+void WBeatSpinBox::keyPressEvent(QKeyEvent* pEvent) {
+    // Return key applies current value and sends a Shift+Tab event in order
+    // to focus a library widget. In official skins this would be the tracks table.
+    if (pEvent->key() == Qt::Key_Return) {
+        QDoubleSpinBox::keyPressEvent(pEvent);
+        QKeyEvent returnKeyEvent = QKeyEvent{QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier};
+        QApplication::sendEvent(this, &returnKeyEvent);
+        return;
+    }
+    return QDoubleSpinBox::keyPressEvent(pEvent);
+}
+
 bool WBeatLineEdit::event(QEvent* pEvent) {
     if (pEvent->type() == QEvent::FontChange) {
         const QFont& fonti = font();

src/widget/wbeatspinbox.h

@@ -33,6 +33,7 @@ class WBeatSpinBox : public QDoubleSpinBox, public WBaseWidget {
 
     // for font scaling
     bool event(QEvent* pEvent) override;
+    void keyPressEvent(QKeyEvent* pEvent) override;
     double m_scaleFactor;
 };
 

src/widget/weffectselector.cpp

@@ -1,5 +1,6 @@
 #include "widget/weffectselector.h"
 
+#include <QApplication>
 #include <QtDebug>
 
 #include "effects/effectsmanager.h"
@@ -11,9 +12,11 @@ WEffectSelector::WEffectSelector(QWidget* pParent, EffectsManager* pEffectsManag
           WBaseWidget(this),
           m_pEffectsManager(pEffectsManager),
           m_scaleFactor(1.0) {
-    // Prevent this widget from getting focused to avoid
-    // interfering with using the library via keyboard.
-    setFocusPolicy(Qt::NoFocus);
+    // Prevent this widget from getting focused by Tab/Shift+Tab
+    // to avoid interfering with using the library via keyboard.
+    // Allow click focus though so the list can always be opened by mouse,
+    // see https://bugs.launchpad.net/mixxx/+bug/1902125
+    setFocusPolicy(Qt::ClickFocus);
 }
 
 void WEffectSelector::setup(const QDomNode& node, const SkinContext& context) {
@@ -37,7 +40,7 @@ void WEffectSelector::setup(const QDomNode& node, const SkinContext& context) {
                 this,
                 &WEffectSelector::slotEffectUpdated);
         connect(this,
-                QOverload<int>::of(&WEffectSelector::currentIndexChanged),
+                QOverload<int>::of(&WEffectSelector::activated),
                 this,
                 &WEffectSelector::slotEffectSelected);
     } else {
@@ -91,6 +94,12 @@ void WEffectSelector::slotEffectSelected(int newIndex) {
             id);
 
     setBaseTooltip(itemData(newIndex, Qt::ToolTipRole).toString());
+    // After selecting an effect send Shift+Tab to move focus to the next
+    // keyboard-focusable widget (tracks table in official skins) in order
+    // to immediately allow keyboard shortcuts again.
+    QKeyEvent backwardFocusKeyEvent =
+            QKeyEvent{QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier};
+    QApplication::sendEvent(this, &backwardFocusKeyEvent);
 }
 
 void WEffectSelector::slotEffectUpdated() {