From ae0dfb862263e8e39339103b1fd87535d2437c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Fri, 9 Oct 2026 13:51:18 +0200 Subject: [PATCH] [UI] Auto-select first completion match in popup --- .../src/interface/widgets/utility/card_completer_styler.cpp | 4 ++-- .../src/interface/widgets/utility/line_edit_completer.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp index fef1dcbf7..e7a4a7588 100644 --- a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp +++ b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp @@ -176,11 +176,11 @@ void CardCompleterStyler::ensureClosestSelected() } const int currentRow = popup->currentIndex().row(); - const int closestRow = rowCount - 1; + const int closestRow = 0; if (currentRow != closestRow) { popup->selectionModel()->setCurrentIndex(completionModel->index(closestRow, completer->completionColumn()), - QItemSelectionModel::NoUpdate); + QItemSelectionModel::SelectCurrent); } } diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp index 98ee5063f..e32dc25e3 100644 --- a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp +++ b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp @@ -71,8 +71,7 @@ void LineEditCompleter::focusOutEvent(QFocusEvent *e) if (popupWasVisible && e->reason() == Qt::TabFocusReason) { // Refocus the edit so Tab doesn't move focus away - // Use a queued connection to ensure focus is restored after the focus change completes - QMetaObject::invokeMethod(this, "setFocus", Qt::QueuedConnection); + setFocus(); e->accept(); return; }