From 09131740992b15ca322054e5c8aee784c6eade79 Mon Sep 17 00:00:00 2001
From: Zihad <zihadmahiuddin@gmail.com>
Date: Fri, 28 Feb 2025 00:20:58 +0600
Subject: [PATCH 1/3] Fix settings control not visible because of previous
 search

This also makes `SettingsPanel`'s `SearchTextBox` protected from private so that `SettingsOverlay` can access it.
---
 osu.Game/Overlays/SettingsOverlay.cs |  3 +++
 osu.Game/Overlays/SettingsPanel.cs   | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 1157860e03..8a39d75565 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -68,6 +68,9 @@ namespace osu.Game.Overlays
         public void ShowAtControl<T>()
             where T : Drawable
         {
+            // if search isn't cleared then the target control won't be visible if it doesn't match the query
+            SearchTextBox.Current.Value = "";
+
             Show();
 
             // wait for load of sections
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index df50e0f339..d8b054eaf8 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays
 
         public SettingsSectionsContainer SectionsContainer { get; private set; }
 
-        private SeekLimitedSearchTextBox searchTextBox;
+        protected SeekLimitedSearchTextBox SearchTextBox;
 
         protected override string PopInSampleName => "UI/settings-pop-in";
         protected override double PopInOutSampleBalance => -OsuGameBase.SFX_STEREO_STRENGTH;
@@ -135,7 +135,7 @@ namespace osu.Game.Overlays
                         },
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
-                        Child = searchTextBox = new SettingsSearchTextBox
+                        Child = SearchTextBox = new SettingsSearchTextBox
                         {
                             RelativeSizeAxes = Axes.X,
                             Origin = Anchor.TopCentre,
@@ -183,8 +183,8 @@ namespace osu.Game.Overlays
             Sidebar?.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
             this.FadeTo(1, TRANSITION_LENGTH / 2, Easing.OutQuint);
 
-            searchTextBox.TakeFocus();
-            searchTextBox.HoldFocus = true;
+            SearchTextBox.TakeFocus();
+            SearchTextBox.HoldFocus = true;
         }
 
         protected virtual float ExpandedPosition => 0;
@@ -199,8 +199,8 @@ namespace osu.Game.Overlays
             Sidebar?.MoveToX(-sidebar_width, TRANSITION_LENGTH, Easing.OutQuint);
             this.FadeTo(0, TRANSITION_LENGTH / 2, Easing.OutQuint);
 
-            searchTextBox.HoldFocus = false;
-            if (searchTextBox.HasFocus)
+            SearchTextBox.HoldFocus = false;
+            if (SearchTextBox.HasFocus)
                 GetContainingFocusManager()!.ChangeFocus(null);
         }
 
@@ -208,7 +208,7 @@ namespace osu.Game.Overlays
 
         protected override void OnFocus(FocusEvent e)
         {
-            searchTextBox.TakeFocus();
+            SearchTextBox.TakeFocus();
             base.OnFocus(e);
         }
 
@@ -234,7 +234,7 @@ namespace osu.Game.Overlays
 
                 loading.Hide();
 
-                searchTextBox.Current.BindValueChanged(term => SectionsContainer.SearchTerm = term.NewValue, true);
+                SearchTextBox.Current.BindValueChanged(term => SectionsContainer.SearchTerm = term.NewValue, true);
 
                 loadSidebarButtons();
             });

From 88089fb0144a54d99b2e586f2d1b8e4512494604 Mon Sep 17 00:00:00 2001
From: Zihad <zihadmahiuddin@gmail.com>
Date: Fri, 28 Feb 2025 19:03:39 +0600
Subject: [PATCH 2/3] make `SettingsPanel.SearchTextBox`'s setter private

---
 osu.Game/Overlays/SettingsPanel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index d8b054eaf8..9b268c573f 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays
 
         public SettingsSectionsContainer SectionsContainer { get; private set; }
 
-        protected SeekLimitedSearchTextBox SearchTextBox;
+        protected SeekLimitedSearchTextBox SearchTextBox { get; private set; }
 
         protected override string PopInSampleName => "UI/settings-pop-in";
         protected override double PopInOutSampleBalance => -OsuGameBase.SFX_STEREO_STRENGTH;

From 0d7c00ae09d65d7c4a53abd1860d3029e1c004bd Mon Sep 17 00:00:00 2001
From: Zihad <zihadmahiuddin@gmail.com>
Date: Fri, 28 Feb 2025 19:04:47 +0600
Subject: [PATCH 3/3] use `Bindable.SetDefault` for clearing search text

---
 osu.Game/Overlays/SettingsOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 8a39d75565..630675a717 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Overlays
             where T : Drawable
         {
             // if search isn't cleared then the target control won't be visible if it doesn't match the query
-            SearchTextBox.Current.Value = "";
+            SearchTextBox.Current.SetDefault();
 
             Show();