From c343036d3bfd60cb24477fcd2ae1286276236a68 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Tue, 6 Jun 2023 12:24:53 +0100
Subject: [PATCH] Simplify

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/widgets/VersionSelectWidget.cpp | 29 +++++++--------------
 launcher/ui/widgets/VersionSelectWidget.h   |  1 -
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/launcher/ui/widgets/VersionSelectWidget.cpp b/launcher/ui/widgets/VersionSelectWidget.cpp
index 252e2719e..6aaffaaca 100644
--- a/launcher/ui/widgets/VersionSelectWidget.cpp
+++ b/launcher/ui/widgets/VersionSelectWidget.cpp
@@ -36,7 +36,15 @@ VersionSelectWidget::VersionSelectWidget(bool focusSearch, QWidget* parent)
     search->setPlaceholderText(tr("Search"));
     search->setClearButtonEnabled(true);
     verticalLayout->addWidget(search);
-    connect(search, &QLineEdit::textEdited, this, &VersionSelectWidget::updateSearch);
+    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);
+    });
 
     sneakyProgressBar = new QProgressBar(this);
     sneakyProgressBar->setObjectName(QStringLiteral("sneakyProgressBar"));
@@ -124,7 +132,6 @@ void VersionSelectWidget::loadList()
         loadTask->start();
     }
     sneakyProgressBar->setHidden(false);
-    search->setHidden(true);
 }
 
 void VersionSelectWidget::onTaskSucceeded()
@@ -134,13 +141,6 @@ void VersionSelectWidget::onTaskSucceeded()
         listView->setEmptyMode(VersionListView::String);
     }
     sneakyProgressBar->setHidden(true);
-    search->setHidden(false);
-
-    if (focusSearch)
-    {
-        search->setFocus();
-        focusSearch = false;
-    }
 
     preselect();
     loadTask = nullptr;
@@ -174,17 +174,6 @@ 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 df9c8a628..8d2c900c8 100644
--- a/launcher/ui/widgets/VersionSelectWidget.h
+++ b/launcher/ui/widgets/VersionSelectWidget.h
@@ -89,7 +89,6 @@ private slots:
 
 private:
     void preselect();
-    void updateSearch(const QString &value);
 
 private:
     QString m_currentVersion;