sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-07 06:37:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove more unnecessary schedule/cancel logic

Browse Source
This commit is contained in:
Dean Herbert 2022-01-28 22:13:52 +09:00
parent a700ad3849
commit c48e9f2bbd
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Online/Leaderboards/Leaderboard.cs
View File

@ -3,10 +3,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Development;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
@ -41,7 +43,6 @@ namespace osu.Game.Online.Leaderboards
private readonly LoadingSpinner loading; private readonly LoadingSpinner loading;
private ScheduledDelegate showScoresDelegate;
private CancellationTokenSource showScoresCancellationSource; private CancellationTokenSource showScoresCancellationSource;
private APIRequest getScoresRequest; private APIRequest getScoresRequest;
@ -61,15 +62,16 @@ namespace osu.Game.Online.Leaderboards
get => scores; get => scores;
protected set protected set
{ {
Debug.Assert(ThreadSafety.IsUpdateThread);
scores = value; scores = value;
scrollFlow?.FadeOut(fade_duration, Easing.OutQuint).Expire(); scrollFlow?.FadeOut(fade_duration, Easing.OutQuint).Expire();
scrollFlow = null; scrollFlow = null;
showScoresDelegate?.Cancel();
showScoresCancellationSource?.Cancel(); showScoresCancellationSource?.Cancel();
if (scores == null || !scores.Any()) if (scores?.Any() != true)
{ {
loading.Hide(); loading.Hide();
return; return;
@ -84,11 +86,11 @@ namespace osu.Game.Online.Leaderboards
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Spacing = new Vector2(0f, 5f), Spacing = new Vector2(0f, 5f),
Padding = new MarginPadding { Top = 10, Bottom = 5 }, Padding = new MarginPadding { Top = 10, Bottom = 5 },
ChildrenEnumerable = scores.Select((s, index) => CreateDrawableScore(s, index + 1))
}; };
scoreFlow.ChildrenEnumerable = scores.Select((s, index) => CreateDrawableScore(s, index + 1));
// schedule because we may not be loaded yet (LoadComponentAsync complains). // schedule because we may not be loaded yet (LoadComponentAsync complains).
showScoresDelegate = Schedule(() => LoadComponentAsync(scoreFlow, _ => LoadComponentAsync(scoreFlow, _ =>
{ {
scrollContainer.Add(scrollFlow = scoreFlow); scrollContainer.Add(scrollFlow = scoreFlow);
@ -100,9 +102,9 @@ namespace osu.Game.Online.Leaderboards
s.Show(); s.Show();
} }
scrollContainer.ScrollTo(0f, false); scrollContainer.ScrollToStart(false);
loading.Hide(); loading.Hide();
}, (showScoresCancellationSource = new CancellationTokenSource()).Token)); }, (showScoresCancellationSource = new CancellationTokenSource()).Token);
} }
} }
@ -253,6 +255,9 @@ namespace osu.Game.Online.Leaderboards
private void cancelPendingWork() private void cancelPendingWork()
{ {
showScoresCancellationSource?.Cancel();
showScoresCancellationSource = null;
getScoresRequest?.Cancel(); getScoresRequest?.Cancel();
getScoresRequest = null; getScoresRequest = null;