sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 14:17:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update dependency

Browse Source
This commit is contained in:
Andrei Zavatski
2019-11-15 12:04:01 +03:00
parent 9fd225bda7
commit 18f77008db
4 changed files with 39 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
View File

@ -14,14 +14,40 @@ using osuTK.Graphics;
using System;
using System.Linq;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Overlays.BeatmapSet
{
public class LeaderboardModSelector : CompositeDrawable
{
public readonly BindableList<Mod> SelectedMods = new BindableList<Mod>();
public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
private RulesetInfo ruleset;
public RulesetInfo Ruleset
{
get => ruleset;
set
{
if (ruleset == value)
{
DeselectAll();
return;
}
ruleset = value;
SelectedMods.Clear();
modsContainer.Clear();
if (ruleset == null)
return;
modsContainer.Add(new ModButton(new ModNoMod()));
modsContainer.AddRange(ruleset.CreateInstance().GetAllMods().Where(m => m.Ranked).Select(m => new ModButton(m)));
modsContainer.ForEach(button => button.OnSelectionChanged = selectionChanged);
}
}
private readonly FillFlowContainer<ModButton> modsContainer;
@ -38,26 +64,6 @@ namespace osu.Game.Overlays.BeatmapSet
};
}
protected override void LoadComplete()
{
base.LoadComplete();
Ruleset.BindValueChanged(onRulesetChanged, true);
}
private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
{
SelectedMods.Clear();
modsContainer.Clear();
if (ruleset.NewValue == null)
return;
modsContainer.Add(new ModButton(new NoMod()));
modsContainer.AddRange(ruleset.NewValue.CreateInstance().GetAllMods().Where(m => m.Ranked).Select(m => new ModButton(m)));
modsContainer.ForEach(button => button.OnSelectionChanged = selectionChanged);
}
private void selectionChanged(Mod mod, bool selected)
{
if (selected)
@ -139,18 +145,5 @@ namespace osu.Game.Overlays.BeatmapSet
protected override void OnHighlightedChanged(ValueChangedEvent<bool> highlighted) =>
this.FadeColour(highlighted.NewValue ? Color4.White : Color4.Gray, duration, Easing.OutQuint);
}
private class NoMod : Mod
{
public override string Name => "NoMod";
public override string Acronym => "NM";
public override double ScoreMultiplier => 1;
public override IconUsage Icon => FontAwesome.Solid.Ban;
public override ModType Type => ModType.System;
}
}
}

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

@ -107,10 +107,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{
Current = { BindTarget = scope }
},
modSelector = new LeaderboardModSelector
{
Ruleset = { BindTarget = ruleset }
}
modSelector = new LeaderboardModSelector()
}
},
new Container
@ -190,13 +187,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private void onBeatmapChanged(ValueChangedEvent<BeatmapInfo> beatmap)
{
var beatmapRuleset = beatmap.NewValue?.Ruleset;
if (ruleset.Value?.Equals(beatmapRuleset) ?? false)
modSelector.DeselectAll();
else
ruleset.Value = beatmapRuleset;
ruleset.Value = modSelector.Ruleset = beatmap.NewValue?.Ruleset;
scope.Value = BeatmapLeaderboardScope.Global;
}