From f0753dcfd8a516c09eebca82acbaf89e96116c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hu=E1=BB=B3nh=20Thi=E1=BB=87n=20L=E1=BB=99c?=
 <huynhloc.contact@gmail.com>
Date: Fri, 28 Aug 2026 21:17:59 +0700
Subject: [PATCH] fix(settings): keep search result visible (#3209)

* fix(settings): keep search result visible

* fix(settings): keep search field visible
---
 .../Modals/Settings/SettingsSidebar.qml       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/quickshell/Modals/Settings/SettingsSidebar.qml b/quickshell/Modals/Settings/SettingsSidebar.qml
index 4dfc6d17a..d2a0960ab 100644
--- a/quickshell/Modals/Settings/SettingsSidebar.qml
+++ b/quickshell/Modals/Settings/SettingsSidebar.qml
@@ -730,6 +730,25 @@ Rectangle {
         if (SettingsSearchService.results.length === 0)
             return;
         searchSelectedIndex = Math.max(0, Math.min(searchSelectedIndex + delta, SettingsSearchService.results.length - 1));
+        Qt.callLater(ensureSearchResultVisible);
+    }
+
+    function ensureSearchResultVisible() {
+        const result = searchResultsRepeater.itemAt(searchSelectedIndex);
+        const contentItem = sidebarFlickable.contentItem;
+        if (!result || !contentItem)
+            return;
+
+        const mapped = result.mapToItem(contentItem, 0, 0);
+        const margin = Theme.spacingS;
+        const top = mapped.y;
+        const bottom = top + result.height;
+        const maxContentY = Math.max(0, sidebarFlickable.contentHeight - sidebarFlickable.height);
+        if (top < sidebarFlickable.contentY + margin) {
+            sidebarFlickable.contentY = Math.max(0, top - margin);
+        } else if (bottom > sidebarFlickable.contentY + sidebarFlickable.height - margin) {
+            sidebarFlickable.contentY = Math.min(maxContentY, bottom - sidebarFlickable.height + margin);
+        }
     }
 
     DankFlickable {
@@ -774,6 +793,8 @@ Rectangle {
                 onTextChanged: {
                     SettingsSearchService.search(text);
                     root.searchSelectedIndex = 0;
+                    sidebarFlickable.contentY = 0;
+                    Qt.callLater(root.ensureSearchResultVisible);
                 }
                 keyForwardTargets: [keyHandler]
 
@@ -844,6 +865,7 @@ Rectangle {
                 }
 
                 Repeater {
+                    id: searchResultsRepeater
                     model: ScriptModel {
                         values: SettingsSearchService.results
                     }