3 files changed, 69 insertions, 15 deletions

diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index 15994319..c94fdd8d 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -46,7 +46,7 @@ void JavaSettingsWidget::setupUi()
     m_verticalLayout = new QVBoxLayout(this);
     m_verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
 
-    m_versionWidget = new VersionSelectWidget(this);
+    m_versionWidget = new VersionSelectWidget(true, this);
     m_verticalLayout->addWidget(m_versionWidget);
 
     m_horizontalLayout = new QHBoxLayout();
diff --git a/launcher/ui/widgets/VersionSelectWidget.cpp b/launcher/ui/widgets/VersionSelectWidget.cpp
index 404860d9..252e2719 100644
--- a/launcher/ui/widgets/VersionSelectWidget.cpp
+++ b/launcher/ui/widgets/VersionSelectWidget.cpp
@@ -8,8 +8,10 @@
 
 #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 +32,12 @@ 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, &VersionSelectWidget::updateSearch);
+
     sneakyProgressBar = new QProgressBar(this);
     sneakyProgressBar->setObjectName(QStringLiteral("sneakyProgressBar"));
     sneakyProgressBar->setFormat(QStringLiteral("%p%"));
@@ -89,6 +97,8 @@ void VersionSelectWidget::initialize(BaseVersionList *vlist)
         {
             listView->setEmptyMode(VersionListView::String);
         }
+        search->setFocus();
+        focusSearch = false;
         preselect();
     }
 }
@@ -114,6 +124,7 @@ void VersionSelectWidget::loadList()
         loadTask->start();
     }
     sneakyProgressBar->setHidden(false);
+    search->setHidden(true);
 }
 
 void VersionSelectWidget::onTaskSucceeded()
@@ -123,6 +134,14 @@ void VersionSelectWidget::onTaskSucceeded()
         listView->setEmptyMode(VersionListView::String);
     }
     sneakyProgressBar->setHidden(true);
+    search->setHidden(false);
+
+    if (focusSearch)
+    {
+        search->setFocus();
+        focusSearch = false;
+    }
+
     preselect();
     loadTask = nullptr;
 }
@@ -155,6 +174,17 @@ void VersionSelectWidget::preselect()
     selectRecommended();
 }
 
+void VersionSelectWidget::updateSearch(const QString &value) {
+    m_proxyModel->setSearch(value);
+    // if nothing is selected, pick the first result
+    if (!value.isEmpty()) {
+        listView->selectionModel()->setCurrentIndex(
+            listView->model()->index(0, 0), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+        listView->scrollToTop();
+    } else
+        listView->scrollTo(listView->selectionModel()->currentIndex(), QAbstractItemView::PositionAtCenter);
+}
+
 void VersionSelectWidget::selectCurrent()
 {
     if(m_currentVersion.isEmpty())
diff --git a/launcher/ui/widgets/VersionSelectWidget.h b/launcher/ui/widgets/VersionSelectWidget.h
index e75efc6f..df9c8a62 100644
--- a/launcher/ui/widgets/VersionSelectWidget.h
+++ b/launcher/ui/widgets/VersionSelectWidget.h
@@ -1,22 +1,43 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #pragma once
 
 #include <QWidget>
 #include <QSortFilterProxyModel>
+#include <QLineEdit>
 #include "BaseVersionList.h"
 #include "VersionListView.h"
 
@@ -30,7 +51,8 @@ class VersionSelectWidget: public QWidget
 {
     Q_OBJECT
 public:
-    explicit VersionSelectWidget(QWidget *parent = 0);
+    explicit VersionSelectWidget(QWidget *parent);
+    explicit VersionSelectWidget(bool focusSearch = false, QWidget *parent = 0);
     ~VersionSelectWidget();
 
     //! loads the list if needed.
@@ -67,6 +89,7 @@ private slots:
 
 private:
     void preselect();
+    void updateSearch(const QString &value);
 
 private:
     QString m_currentVersion;
@@ -75,9 +98,10 @@ private:
     int resizeOnColumn = 0;
     Task * loadTask;
     bool preselectedAlready = false;
+    bool focusSearch;
 
-private:
     QVBoxLayout *verticalLayout = nullptr;
     VersionListView *listView = nullptr;
+    QLineEdit *search;
     QProgressBar *sneakyProgressBar = nullptr;
 };