h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-19 12:22:57 +08:00
Code Issues Releases Wiki Activity

Add missing cancellation token and rename load task variable to match purpose

Browse Source
This commit is contained in:
Dean Herbert 2021-12-24 18:58:31 +09:00
parent 3ca238825b
commit d602aebebb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/BeatmapListingOverlay.cs
View File

@ -131,7 +131,7 @@ namespace osu.Game.Overlays
Loading.Show();
}
private Task panelLoadDelegate;
private Task panelLoadTask;
private void onSearchFinished(BeatmapListingFilterControl.SearchResult searchResult)
{
@ -155,16 +155,16 @@ namespace osu.Game.Overlays
var content = createCardContainerFor(newCards);
panelLoadDelegate = LoadComponentAsync(foundContent = content, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
panelLoadTask = LoadComponentAsync(foundContent = content, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
}
else
{
panelLoadDelegate = LoadComponentsAsync(newCards, loaded =>
panelLoadTask = LoadComponentsAsync(newCards, loaded =>
{
lastFetchDisplayedTime = Time.Current;
foundContent.AddRange(loaded);
loaded.ForEach(p => p.FadeIn(200, Easing.OutQuint));
});
}, (cancellationToken = new CancellationTokenSource()).Token);
}
}
@ -239,7 +239,7 @@ namespace osu.Game.Overlays
var newCards = createCardsFor(foundContent.Reverse().Select(card => card.BeatmapSet));
panelLoadDelegate = LoadComponentsAsync(newCards, cards =>
panelLoadTask = LoadComponentsAsync(newCards, cards =>
{
foundContent.Clear();
foundContent.AddRange(cards);
@ -374,7 +374,7 @@ namespace osu.Game.Overlays
const int pagination_scroll_distance = 500;
bool shouldShowMore = panelLoadDelegate?.IsCompleted != false
bool shouldShowMore = panelLoadTask?.IsCompleted != false
&& Time.Current - lastFetchDisplayedTime > time_between_fetches
&& (ScrollFlow.ScrollableExtent > 0 && ScrollFlow.IsScrolledToEnd(pagination_scroll_distance));