From 0176698242329c3a1c5e68803bafa033a6592d55 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Fri, 4 Oct 2024 17:46:40 +0200
Subject: [PATCH] fix(gtk): show search and loading indicator

---
 .../gtk/window/settings/instance/ModsTab.kt       | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ModsTab.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ModsTab.kt
index 4ce0fd7..8d6410e 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ModsTab.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ModsTab.kt
@@ -64,15 +64,9 @@ class ModsTab(window: InstanceSettingsWindow) : SettingsTab<Leaflet, InstanceSet
                         }
                     }
                 })
-                append(SearchBar().apply {
-                    hexpand = false
-                    showCloseButton = false
-                    searchMode = false
-                    val entry = SearchEntry().apply {
-                        onSearchChanged { updateSearch(text) }
-                    }
-                    child = entry
-                    keyCaptureWidget = entry
+                append(Entry().apply {
+                    setIconFromIconName(EntryIconPosition.PRIMARY, "edit-find-symbolic")
+                    onChanged { updateSearch(text) }
                 })
                 listModel = StringList(arrayOf())
                 append(Overlay().apply {
@@ -104,6 +98,7 @@ class ModsTab(window: InstanceSettingsWindow) : SettingsTab<Leaflet, InstanceSet
                     listModel.replaceAll(mods.map { it.name }.toTypedArray())
                 } else {
                     loadingRevealer.setRunning(searchResult == null || !mds.isComplete(ScanStage.CROSSREFERENCE))
+                    loadingRevealer.pulse()
                     if (searchResult != null) {
                         for (mod in searchResult.orEmpty()) {
                             this@ModsTab.mods[mod.name] = mod
@@ -123,7 +118,6 @@ class ModsTab(window: InstanceSettingsWindow) : SettingsTab<Leaflet, InstanceSet
     private val search = AsyncRequest({
         searchResult = null
         loadingRevealer.setRunning(true)
-        loadingRevealer.pulse()
         VoidFuture(ForkJoinPool.commonPool().submit {
             val sources: List<ModSource> = when (page) {
                 Page.CURSEFORGE -> {
@@ -157,7 +151,6 @@ class ModsTab(window: InstanceSettingsWindow) : SettingsTab<Leaflet, InstanceSet
         updateSearch(currentSearchString)
     }
     fun updateSearch(search: String): Unit {
-        descriptionLabel.text = "Searching is currently unsupported"
         currentSearchString = search
         backgroundTask { this.search.request() }
     }