sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-01 19:57:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Added refresh scoreboard upon deleting local score and formatted the code

Browse Source
This commit is contained in:
wltu 2019-12-17 12:56:30 -08:00
parent bb2b1475cd
commit 8aeef3f59a
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Online/Leaderboards/LeaderboardScore.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -54,9 +55,11 @@ namespace osu.Game.Online.Leaderboards
private FillFlowContainer<ModIcon> modsContainer; private FillFlowContainer<ModIcon> modsContainer;
private List<ScoreComponentLabel> statisticsLabels; private List<ScoreComponentLabel> statisticsLabels;
private DialogOverlay dialogOverlay; private DialogOverlay dialogOverlay;
public Action RefreshAction { get; set; }
public LeaderboardScore(ScoreInfo score, int rank, bool allowHighlight = true) public LeaderboardScore(ScoreInfo score, int rank, bool allowHighlight = true)
{ {
this.score = score; this.score = score;
@ -367,9 +370,15 @@ namespace osu.Game.Online.Leaderboards
} }
} }
public MenuItem[] ContextMenuItems => new MenuItem[] public MenuItem[] ContextMenuItems
{ {
new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay?.Push(new BeatmapClearScoresDialog(this.score, null))) get
}; {
return (this.allowHighlight) ? null : new MenuItem[]
{
new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay?.Push(new BeatmapClearScoresDialog(this.score, () => Schedule(this.RefreshAction))))
};
}
}
} }
} }

6
osu.Game/Screens/Select/BeatmapClearScoresDialog.cs
View File

@ -52,11 +52,7 @@ namespace osu.Game.Screens.Select
new PopupDialogOkButton new PopupDialogOkButton
{ {
Text = @"Yes. Please.", Text = @"Yes. Please.",
Action = () => Action = (() => scoreManager.Delete(score)) + onCompletion
{
Task.Run(() => scoreManager.Delete(score))
.ContinueWith(_ => onCompletion);
}
}, },
new PopupDialogCancelButton new PopupDialogCancelButton
{ {

10
osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
View File

@ -15,6 +15,8 @@ using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Screens.Select.Leaderboards namespace osu.Game.Screens.Select.Leaderboards
{ {
public class BeatmapLeaderboard : Leaderboard<BeatmapLeaderboardScope, ScoreInfo> public class BeatmapLeaderboard : Leaderboard<BeatmapLeaderboardScope, ScoreInfo>
@ -182,12 +184,14 @@ namespace osu.Game.Screens.Select.Leaderboards
return req; return req;
} }
protected override LeaderboardScore CreateDrawableScore(ScoreInfo model, int index){ protected override LeaderboardScore CreateDrawableScore(ScoreInfo model, int index)
{
model.Beatmap = beatmap; model.Beatmap = beatmap;
return new LeaderboardScore(model, index, IsOnlineScope) return new LeaderboardScore(model, index, IsOnlineScope)
{ {
Action = () => ScoreSelected?.Invoke(model) Action = () => ScoreSelected?.Invoke(model),
RefreshAction = () => this.RefreshScores()
}; };
} }
} }