From cd102da3af06d06486ea20daa319f143ab13632c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Mar 2023 16:34:31 +0900
Subject: [PATCH] Move matches string inside text box

---
 osu.Game/Screens/Select/FilterControl.cs | 50 +++++++++++++++---------
 osu.Game/Screens/Select/SongSelect.cs    |  4 +-
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index b5469abffe..1bcc042f72 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -38,8 +38,8 @@ namespace osu.Game.Screens.Select
 
         public LocalisableString InformationalText
         {
-            get => filterText.Text;
-            set => filterText.Text = value;
+            get => searchTextBox.FilterText.Text;
+            set => searchTextBox.FilterText.Text = value;
         }
 
         private OsuTabControl<SortMode> sortTabs;
@@ -48,12 +48,10 @@ namespace osu.Game.Screens.Select
 
         private Bindable<GroupMode> groupMode;
 
-        private SeekLimitedSearchTextBox searchTextBox;
+        private FilterControlTextBox searchTextBox;
 
         private CollectionDropdown collectionDropdown;
 
-        private OsuSpriteText filterText;
-
         public FilterCriteria CreateCriteria()
         {
             string query = searchTextBox.Text;
@@ -111,22 +109,9 @@ namespace osu.Game.Screens.Select
                         Spacing = new Vector2(0, 5),
                         Children = new Drawable[]
                         {
-                            searchTextBox = new SeekLimitedSearchTextBox { RelativeSizeAxes = Axes.X },
-                            new Container
+                            searchTextBox = new FilterControlTextBox
                             {
                                 RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                AutoSizeDuration = 200,
-                                AutoSizeEasing = Easing.OutQuint,
-                                Children = new Drawable[]
-                                {
-                                    filterText = new OsuSpriteText
-                                    {
-                                        Anchor = Anchor.TopRight,
-                                        Origin = Anchor.TopRight,
-                                        Font = OsuFont.Default.With(size: 12),
-                                    },
-                                }
                             },
                             new Box
                             {
@@ -262,5 +247,32 @@ namespace osu.Game.Screens.Select
         protected override bool OnClick(ClickEvent e) => true;
 
         protected override bool OnHover(HoverEvent e) => true;
+
+        private partial class FilterControlTextBox : SeekLimitedSearchTextBox
+        {
+            private const float filter_text_size = 12;
+
+            public OsuSpriteText FilterText;
+
+            public FilterControlTextBox()
+            {
+                Height += filter_text_size;
+                TextContainer.Margin = new MarginPadding { Bottom = filter_text_size };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                TextContainer.Add(FilterText = new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.TopLeft,
+                    Depth = float.MinValue,
+                    Font = OsuFont.Default.With(size: filter_text_size, weight: FontWeight.SemiBold),
+                    Margin = new MarginPadding { Top = 2, Left = 2 },
+                    Colour = colours.Yellow
+                });
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a3521337ee..722119f82e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -168,8 +168,8 @@ namespace osu.Game.Screens.Select
                         Carousel.CountDisplayed == 1
                             // Intentionally not localised until we have proper support for this (see https://github.com/ppy/osu-framework/pull/4918
                             // but also in this case we want support for formatting a number within a string).
-                            ? $"{Carousel.CountDisplayed:#,0} beatmap displayed"
-                            : $"{Carousel.CountDisplayed:#,0} beatmaps displayed";
+                            ? $"{Carousel.CountDisplayed:#,0} matching beatmap"
+                            : $"{Carousel.CountDisplayed:#,0} matching beatmaps";
                 },
                 GetRecommendedBeatmap = s => recommender?.GetRecommendedBeatmap(s),
             }, c => carouselContainer.Child = c);