RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove OnHighlightedChanged function

This commit is contained in:
Andrei Zavatski 2019-11-21 20:22:15 +03:00
parent e22a71c6b8
commit c7c8527f5f
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,13 +114,12 @@ protected override void LoadComplete()
this.FadeColour(hovered.NewValue ? Color4.White : Color4.DimGray, duration, Easing.OutQuint);
}, true);
}
protected override void OnHighlightedChanged(ValueChangedEvent<bool> highlighted)
{
base.OnHighlightedChanged(highlighted);
OnSelectionChanged?.Invoke(Mod, highlighted.NewValue);
IsActive.TriggerChange();
Highlighted.BindValueChanged(highlighted =>
{
OnSelectionChanged?.Invoke(Mod, highlighted.NewValue);
IsActive.TriggerChange();
}, true);
}
protected override bool OnClick(ClickEvent e)

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

@ -107,19 +107,12 @@ private void load(OsuColour colours)
modIcon.Colour = colours.Yellow;
break;
}
background.Colour = backgroundColour;
}
protected override void LoadComplete()
{
base.LoadComplete();
Highlighted.BindValueChanged(OnHighlightedChanged, true);
}
protected virtual void OnHighlightedChanged(ValueChangedEvent<bool> highlighted)
{
background.Colour = highlighted.NewValue ? highlightedColour : backgroundColour;
Highlighted.BindValueChanged(highlighted => background.Colour = highlighted.NewValue ? highlightedColour : backgroundColour, true);
}
}
}