Merge pull request #19129 from peppy/placeholder-fixes

Fix clicking search link from song select sometimes not switching search mode to "relevance"
ppy · Jul 15, 2022 · 4ee9bb3 · 4ee9bb3
2 parents cbbc8fd + 838e9ec
commit 4ee9bb3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -143,7 +143,7 @@ private void load(OverlayColourProvider colourProvider, IAPIProvider api)
         }
 
         public void Search(string query)
-            => searchControl.Query.Value = query;
+            => Schedule(() => searchControl.Query.Value = query);
 
         protected override void LoadComplete()
         {

diff --git a/osu.Game/Screens/Select/NoResultsPlaceholder.cs b/osu.Game/Screens/Select/NoResultsPlaceholder.cs
@@ -109,7 +109,7 @@ private void updateText()
                 textFlow.AddParagraph("No beatmaps found!");
                 textFlow.AddParagraph(string.Empty);
 
-                textFlow.AddParagraph("Consider using the \"");
+                textFlow.AddParagraph("- Consider running the \"");
                 textFlow.AddLink(FirstRunSetupOverlayStrings.FirstRunSetupTitle, () => firstRunSetupOverlay?.Show());
                 textFlow.AddText("\" to download or import some beatmaps!");
             }
@@ -141,15 +141,14 @@ private void updateText()
                     textFlow.AddLink(" enabling ", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
                     textFlow.AddText("automatic conversion!");
                 }
-
-                if (!string.IsNullOrEmpty(filter?.SearchText))
-                {
-                    textFlow.AddParagraph("- Try ");
-                    textFlow.AddLink("searching online", LinkAction.SearchBeatmapSet, filter.SearchText);
-                    textFlow.AddText($" for \"{filter.SearchText}\".");
-                }
             }
 
+            if (!string.IsNullOrEmpty(filter?.SearchText))
+            {
+                textFlow.AddParagraph("- Try ");
+                textFlow.AddLink("searching online", LinkAction.SearchBeatmapSet, filter.SearchText);
+                textFlow.AddText($" for \"{filter.SearchText}\".");
+            }
             // TODO: add clickable link to reset criteria.
         }
     }