Merge branch 'master' into results-screen-quick-retry-transition

peppy · Dec 4, 2024 · a7586c5 · a7586c5
2 parents a4d5864 + e555131
commit a7586c5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
@@ -13,7 +13,7 @@ public partial class BindingSettings : SettingsSubsection
     {
         protected override LocalisableString Header => BindingSettingsStrings.ShortcutAndGameplayBindings;
 
-        public override IEnumerable<LocalisableString> FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { @"keybindings", @"controls", @"keyboard", @"keys" });
+        public override IEnumerable<LocalisableString> FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { @"keybindings", @"controls", @"keyboard", @"keys", @"buttons" });
 
         public BindingSettings(KeyBindingPanel keyConfig)
         {

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -80,19 +81,34 @@ private void applyFilterCriteria(FilterCriteria? criteria)
                     bool matchingFilter = true;
 
                     matchingFilter &= criteria.Ruleset == null || r.Room.PlaylistItemStats?.RulesetIDs.Any(id => id == criteria.Ruleset.OnlineID) != false;
-
-                    if (!string.IsNullOrEmpty(criteria.SearchString))
-                    {
-                        // Room name isn't translatable, so ToString() is used here for simplicity.
-                        matchingFilter &= r.FilterTerms.Any(term => term.ToString().Contains(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase));
-                    }
-
                     matchingFilter &= matchPermissions(r, criteria.Permissions);
 
+                    // Room name isn't translatable, so ToString() is used here for simplicity.
+                    string[] filterTerms = r.FilterTerms.Select(t => t.ToString()).ToArray();
+                    string[] searchTerms = criteria.SearchString.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+                    matchingFilter &= searchTerms.All(searchTerm => filterTerms.Any(filterTerm => checkTerm(filterTerm, searchTerm)));
+
                     r.MatchingFilter = matchingFilter;
                 }
             });
 
+            // Lifted from SearchContainer.
+            static bool checkTerm(string haystack, string needle)
+            {
+                int index = 0;
+
+                for (int i = 0; i < needle.Length; i++)
+                {
+                    int found = CultureInfo.InvariantCulture.CompareInfo.IndexOf(haystack, needle[i], index, CompareOptions.OrdinalIgnoreCase);
+                    if (found < 0)
+                        return false;
+
+                    index = found + 1;
+                }
+
+                return true;
+            }
+
             static bool matchPermissions(DrawableLoungeRoom room, RoomPermissionsFilter accessType)
             {
                 switch (accessType)