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

Handle scope changing

Browse Source
This commit is contained in:
Andrei Zavatski 2019-11-11 18:27:48 +03:00
parent 00b9229737
commit 2cfd54ca0d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ using osu.Game.Online.API;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Screens.Select.Leaderboards;
namespace osu.Game.Overlays.BeatmapSet.Scores namespace osu.Game.Overlays.BeatmapSet.Scores
{ {
@ -24,6 +25,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>(); public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>(); private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
private readonly Bindable<BeatmapLeaderboardScope> scope = new Bindable<BeatmapLeaderboardScope>();
private readonly Box background; private readonly Box background;
private readonly ScoreTable scoreTable; private readonly ScoreTable scoreTable;
@ -97,7 +99,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Spacing = new Vector2(0, spacing), Spacing = new Vector2(0, spacing),
Children = new Drawable[] Children = new Drawable[]
{ {
new LeaderboardScopeSelector(), new LeaderboardScopeSelector
{
Current = { BindTarget = scope }
},
modSelector = new LeaderboardModSelector modSelector = new LeaderboardModSelector
{ {
Ruleset = { BindTarget = ruleset } Ruleset = { BindTarget = ruleset }
@ -135,6 +140,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
scope.BindValueChanged(_ => getScores());
Beatmap.BindValueChanged(onBeatmapChanged, true); Beatmap.BindValueChanged(onBeatmapChanged, true);
} }
@ -147,21 +153,21 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
else else
ruleset.Value = beatmapRuleset; ruleset.Value = beatmapRuleset;
getScores(beatmap.NewValue); getScores();
} }
private void getScores(BeatmapInfo beatmap) private void getScores()
{ {
getScoresRequest?.Cancel(); getScoresRequest?.Cancel();
getScoresRequest = null; getScoresRequest = null;
Scores = null; Scores = null;
if (beatmap?.OnlineBeatmapID.HasValue != true || beatmap.Status <= BeatmapSetOnlineStatus.Pending) if (Beatmap.Value?.OnlineBeatmapID.HasValue != true || Beatmap.Value.Status <= BeatmapSetOnlineStatus.Pending)
return; return;
loadingAnimation.Show(); loadingAnimation.Show();
getScoresRequest = new GetScoresRequest(beatmap, beatmap.Ruleset); getScoresRequest = new GetScoresRequest(Beatmap.Value, Beatmap.Value.Ruleset, scope.Value);
getScoresRequest.Success += scores => getScoresRequest.Success += scores =>
{ {
loadingAnimation.Hide(); loadingAnimation.Hide();