1 files changed, 43 insertions, 3 deletions

diff --git a/launcher/ui/widgets/VersionSelectWidget.cpp b/launcher/ui/widgets/VersionSelectWidget.cpp
index 404860d9..a956ddb3 100644
--- a/launcher/ui/widgets/VersionSelectWidget.cpp
+++ b/launcher/ui/widgets/VersionSelectWidget.cpp
@@ -1,15 +1,20 @@
 #include "VersionSelectWidget.h"
 
+#include <QApplication>
+#include <QEvent>
+#include <QHeaderView>
+#include <QKeyEvent>
 #include <QProgressBar>
 #include <QVBoxLayout>
-#include <QHeaderView>
 
 #include "VersionProxyModel.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
 
-VersionSelectWidget::VersionSelectWidget(QWidget* parent)
-    : QWidget(parent)
+VersionSelectWidget::VersionSelectWidget(QWidget* parent) : VersionSelectWidget(false, parent) {}
+
+VersionSelectWidget::VersionSelectWidget(bool focusSearch, QWidget* parent)
+    : QWidget(parent), focusSearch(focusSearch)
 {
     setObjectName(QStringLiteral("VersionSelectWidget"));
     verticalLayout = new QVBoxLayout(this);
@@ -30,6 +35,21 @@ VersionSelectWidget::VersionSelectWidget(QWidget* parent)
     listView->setModel(m_proxyModel);
     verticalLayout->addWidget(listView);
 
+    search = new QLineEdit(this);
+    search->setPlaceholderText(tr("Search"));
+    search->setClearButtonEnabled(true);
+    verticalLayout->addWidget(search);
+    connect(search, &QLineEdit::textEdited, [this](const QString& value) {
+        m_proxyModel->setSearch(value);
+        if (!value.isEmpty() || !listView->selectionModel()->hasSelection()) {
+            const QModelIndex first = listView->model()->index(0, 0);
+            listView->selectionModel()->setCurrentIndex(first, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+            listView->scrollToTop();
+        } else
+            listView->scrollTo(listView->selectionModel()->currentIndex(), QAbstractItemView::PositionAtCenter);
+    });
+    search->installEventFilter(this);
+
     sneakyProgressBar = new QProgressBar(this);
     sneakyProgressBar->setObjectName(QStringLiteral("sneakyProgressBar"));
     sneakyProgressBar->setFormat(QStringLiteral("%p%"));
@@ -72,6 +92,23 @@ void VersionSelectWidget::setResizeOn(int column)
     listView->header()->setSectionResizeMode(resizeOnColumn, QHeaderView::Stretch);
 }
 
+bool VersionSelectWidget::eventFilter(QObject *watched, QEvent *event) {
+    if (watched == search && event->type() == QEvent::KeyPress) {
+        const QKeyEvent* keyEvent = (QKeyEvent*)event;
+        const bool up = keyEvent->key() == Qt::Key_Up;
+        const bool down = keyEvent->key() == Qt::Key_Down;
+        if (up || down) {
+            const QModelIndex index = listView->model()->index(listView->currentIndex().row() + (up ? -1 : 1), 0);
+            if (index.row() >= 0 && index.row() < listView->model()->rowCount()) {
+                listView->selectionModel()->setCurrentIndex(index, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+                return true;
+            }
+        }
+    }
+
+    return QObject::eventFilter(watched, event);
+}
+
 void VersionSelectWidget::initialize(BaseVersionList *vlist)
 {
     m_vlist = vlist;
@@ -79,6 +116,9 @@ void VersionSelectWidget::initialize(BaseVersionList *vlist)
     listView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
     listView->header()->setSectionResizeMode(resizeOnColumn, QHeaderView::Stretch);
 
+    if (focusSearch)
+        search->setFocus();
+
     if (!m_vlist->isLoaded())
     {
         loadList();