From 2109a2d26153d163e3da5d5ed0324ec7b58e8489 Mon Sep 17 00:00:00 2001
From: xxSeys1 <kaktusreiniger@gmail.com>
Date: Mon, 9 Jun 2025 18:40:12 +0200
Subject: [PATCH] update content finder popup to wrap on keyboard navigation

- Fixes auto scroll
- Make it wrap
- Add pressing backspace to focus search bar and select all text
---
 Source/Editor/Windows/Search/ContentFinder.cs | 47 +++++++------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/Source/Editor/Windows/Search/ContentFinder.cs b/Source/Editor/Windows/Search/ContentFinder.cs
index e4227e5c4..12b479aea 100644
--- a/Source/Editor/Windows/Search/ContentFinder.cs
+++ b/Source/Editor/Windows/Search/ContentFinder.cs
@@ -180,39 +180,17 @@ namespace FlaxEditor.Windows.Search
             switch (key)
             {
             case KeyboardKeys.ArrowDown:
-            {
-                if (_matchedItems.Count == 0)
-                    return true;
-                int currentPos;
-                if (_selectedItem != null)
-                {
-                    currentPos = _matchedItems.IndexOf(_selectedItem) + 1;
-                    if (currentPos >= _matchedItems.Count)
-                        currentPos--;
-                }
-                else
-                {
-                    currentPos = 0;
-                }
-                SelectedItem = _matchedItems[currentPos];
-                return true;
-            }
             case KeyboardKeys.ArrowUp:
             {
                 if (_matchedItems.Count == 0)
                     return true;
-                int currentPos;
-                if (_selectedItem != null)
-                {
-                    currentPos = _matchedItems.IndexOf(_selectedItem) - 1;
-                    if (currentPos < 0)
-                        currentPos = 0;
-                }
-                else
-                {
-                    currentPos = 0;
-                }
-                SelectedItem = _matchedItems[currentPos];
+
+                var focusedIndex = _matchedItems.IndexOf(_selectedItem);
+                int delta = key == KeyboardKeys.ArrowDown ? -1 : 1;
+                int nextIndex = Mathf.Wrap(focusedIndex - delta, 0, _matchedItems.Count - 1);
+                var nextItem = _matchedItems[nextIndex];
+
+                SelectedItem = nextItem;
                 return true;
             }
             case KeyboardKeys.Return:
@@ -234,6 +212,17 @@ namespace FlaxEditor.Windows.Search
                 Hide();
                 return true;
             }
+            case KeyboardKeys.Backspace:
+            { 
+                // Alow the user to quickly focus the searchbar
+                if (_searchBox != null && !_searchBox.IsFocused)
+                {
+                    _searchBox.Focus();
+                    _searchBox.SelectAll();
+                    return true;
+                }
+                break;
+            }
             }
 
             return base.OnKeyDown(key);