Search: merge Enter/Return key handling

mixxxdj · Feb 17, 2022 · 2b21769 · 2b21769
1 parent d689a1f
commit 2b21769
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/widget/wsearchlineedit.cpp b/src/widget/wsearchlineedit.cpp
@@ -126,15 +126,6 @@ WSearchLineEdit::WSearchLineEdit(QWidget* pParent, UserSettingsPointer pConfig)
             this,
             &WSearchLineEdit::slotIndexChanged);
 
-    // When you hit enter, it will trigger or clear the search.
-    connect(this->lineEdit(),
-            &QLineEdit::returnPressed,
-            this,
-            [this] {
-                if (!slotClearSearchIfClearButtonHasFocus()) {
-                    slotTriggerSearch();
-                }
-            });
     loadQueriesFromConfig();
 
     refreshState();
@@ -352,6 +343,10 @@ void WSearchLineEdit::keyPressEvent(QKeyEvent* keyEvent) {
         }
         break;
     case Qt::Key_Enter:
+    case Qt::Key_Return:
+        if (slotClearSearchIfClearButtonHasFocus()) {
+            return;
+        }
         if (findCurrentTextIndex() == -1) {
             slotSaveSearch();
         }