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

Fix loading animation is no longer present

Browse Source
This commit is contained in:
Andrei Zavatski 2019-07-18 15:08:50 +03:00
parent 7558ac1445
commit fa978a47b0
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
View File

@ -19,7 +19,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
public class ScoresContainer : CompositeDrawable public class ScoresContainer : CompositeDrawable
{ {
private const int spacing = 15; private const int spacing = 15;
private const int fade_duration = 200;
private readonly Box background; private readonly Box background;
private readonly ScoreTable scoreTable; private readonly ScoreTable scoreTable;
@ -53,8 +52,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{ {
Schedule(() => Schedule(() =>
{ {
loading = false;
topScoresContainer.Clear(); topScoresContainer.Clear();
if (value?.Scores.Any() != true) if (value?.Scores.Any() != true)
@ -128,13 +125,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
background.Colour = colours.Gray2; background.Colour = colours.Gray2;
} }
private bool loading
{
set => loadingAnimation.FadeTo(value ? 1 : 0, fade_duration);
}
private void getScores(BeatmapInfo beatmap) private void getScores(BeatmapInfo beatmap)
{ {
loadingAnimation.Show();
getScoresRequest?.Cancel(); getScoresRequest?.Cancel();
getScoresRequest = null; getScoresRequest = null;
@ -142,14 +136,17 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
if (beatmap?.OnlineBeatmapID.HasValue != true) if (beatmap?.OnlineBeatmapID.HasValue != true)
{ {
loading = false; loadingAnimation.Hide();
return; return;
} }
getScoresRequest = new GetScoresRequest(beatmap, beatmap.Ruleset); getScoresRequest = new GetScoresRequest(beatmap, beatmap.Ruleset);
getScoresRequest.Success += scores => Scores = scores; getScoresRequest.Success += scores =>
{
loadingAnimation.Hide();
Scores = scores;
};
api.Queue(getScoresRequest); api.Queue(getScoresRequest);
loading = true;
} }
} }
} }