sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add the ability to override Highlighted action to the ModIcon

Browse Source
This commit is contained in:
Andrei Zavatski
2019-08-12 15:20:21 +03:00
parent 21af390327
commit 62a91e4aaa
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,11 +92,16 @@ namespace osu.Game.Overlays.BeatmapSet
{ {
Scale = new Vector2(mod_scale); Scale = new Vector2(mod_scale);
Add(new HoverClickSounds()); Add(new HoverClickSounds());
}
protected override void LoadComplete()
{
base.LoadComplete();
Selected.BindValueChanged(selected => Selected.BindValueChanged(selected =>
{ {
updateState(); updateState();
OnSelectionChanged?.Invoke(mod, selected.NewValue); OnSelectionChanged?.Invoke(Mod, selected.NewValue);
}, true); }, true);
} }
@ -120,7 +125,12 @@ namespace osu.Game.Overlays.BeatmapSet
private void updateState() private void updateState()
{ {
this.FadeColour(IsHovered || Selected.Value ? Color4.White : Color4.Gray, duration, Easing.OutQuint); Highlighted.Value = (IsHovered || Selected.Value) ? true : false;
}
protected override void OnHighlightedChange(ValueChangedEvent<bool> highlighted)
{
this.FadeColour(highlighted.NewValue ? Color4.White : Color4.Gray, duration, Easing.OutQuint);
} }
} }

13
osu.Game/Rulesets/UI/ModIcon.cs
View File

@ -34,9 +34,11 @@ namespace osu.Game.Rulesets.UI
public virtual string TooltipText { get; } public virtual string TooltipText { get; }
protected Mod Mod { get; private set; }
public ModIcon(Mod mod) public ModIcon(Mod mod)
{ {
if (mod == null) throw new ArgumentNullException(nameof(mod)); Mod = mod ?? throw new ArgumentNullException(nameof(mod));
type = mod.Type; type = mod.Type;
@ -106,12 +108,19 @@ namespace osu.Game.Rulesets.UI
modIcon.Colour = colours.Yellow; modIcon.Colour = colours.Yellow;
break; break;
} }
background.Colour = backgroundColour;
} }
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
Highlighted.BindValueChanged(highlighted => background.Colour = highlighted.NewValue ? highlightedColour : backgroundColour, true); Highlighted.BindValueChanged(OnHighlightedChange, true);
}
protected virtual void OnHighlightedChange(ValueChangedEvent<bool> highlighted)
{
background.Colour = highlighted.NewValue ? highlightedColour : backgroundColour;
} }
} }
} }