h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 06:42:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #19129 from peppy/placeholder-fixes

Browse Source 
Fix clicking search link from song select sometimes not switching search mode to "relevance"
This commit is contained in:
Salman Ahmed 2022-07-15 20:54:42 +03:00 committed by GitHub
commit 4ee9bb3634
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
View File

@ -143,7 +143,7 @@ namespace osu.Game.Overlays.BeatmapListing
} }
public void Search(string query) public void Search(string query)
=> searchControl.Query.Value = query; => Schedule(() => searchControl.Query.Value = query);
protected override void LoadComplete() protected override void LoadComplete()
{ {

15
osu.Game/Screens/Select/NoResultsPlaceholder.cs
View File

@ -109,7 +109,7 @@ namespace osu.Game.Screens.Select
textFlow.AddParagraph("No beatmaps found!"); textFlow.AddParagraph("No beatmaps found!");
textFlow.AddParagraph(string.Empty); textFlow.AddParagraph(string.Empty);
textFlow.AddParagraph("Consider using the \""); textFlow.AddParagraph("- Consider running the \"");
textFlow.AddLink(FirstRunSetupOverlayStrings.FirstRunSetupTitle, () => firstRunSetupOverlay?.Show()); textFlow.AddLink(FirstRunSetupOverlayStrings.FirstRunSetupTitle, () => firstRunSetupOverlay?.Show());
textFlow.AddText("\" to download or import some beatmaps!"); textFlow.AddText("\" to download or import some beatmaps!");
} }
@ -141,15 +141,14 @@ namespace osu.Game.Screens.Select
textFlow.AddLink(" enabling ", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true)); textFlow.AddLink(" enabling ", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
textFlow.AddText("automatic conversion!"); 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. // TODO: add clickable link to reset criteria.
} }
} }