sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-05 21:07:18 +09:00
Code Issues Packages Projects 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(); Loading.Show();
} }
private Task panelLoadDelegate; private Task panelLoadTask;
private void onSearchFinished(BeatmapListingFilterControl.SearchResult searchResult) private void onSearchFinished(BeatmapListingFilterControl.SearchResult searchResult)
{ {
@ -155,16 +155,16 @@ namespace osu.Game.Overlays
var content = createCardContainerFor(newCards); var content = createCardContainerFor(newCards);
panelLoadDelegate = LoadComponentAsync(foundContent = content, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token); panelLoadTask = LoadComponentAsync(foundContent = content, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
} }
else else
{ {
panelLoadDelegate = LoadComponentsAsync(newCards, loaded => panelLoadTask = LoadComponentsAsync(newCards, loaded =>
{ {
lastFetchDisplayedTime = Time.Current; lastFetchDisplayedTime = Time.Current;
foundContent.AddRange(loaded); foundContent.AddRange(loaded);
loaded.ForEach(p => p.FadeIn(200, Easing.OutQuint)); 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)); var newCards = createCardsFor(foundContent.Reverse().Select(card => card.BeatmapSet));
panelLoadDelegate = LoadComponentsAsync(newCards, cards => panelLoadTask = LoadComponentsAsync(newCards, cards =>
{ {
foundContent.Clear(); foundContent.Clear();
foundContent.AddRange(cards); foundContent.AddRange(cards);
@ -374,7 +374,7 @@ namespace osu.Game.Overlays
const int pagination_scroll_distance = 500; const int pagination_scroll_distance = 500;
bool shouldShowMore = panelLoadDelegate?.IsCompleted != false bool shouldShowMore = panelLoadTask?.IsCompleted != false
&& Time.Current - lastFetchDisplayedTime > time_between_fetches && Time.Current - lastFetchDisplayedTime > time_between_fetches
&& (ScrollFlow.ScrollableExtent > 0 && ScrollFlow.IsScrolledToEnd(pagination_scroll_distance)); && (ScrollFlow.ScrollableExtent > 0 && ScrollFlow.IsScrolledToEnd(pagination_scroll_distance));