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

Add web-like hover behavior

This commit is contained in:
Andrei Zavatski 2019-08-12 16:20:36 +03:00
parent 62a91e4aaa
commit b71c776e65
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,12 +57,13 @@ private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
modsContainer.Add(new ModButton(new NoMod()));
foreach (var mod in ruleset.NewValue.CreateInstance().GetAllMods())
ruleset.NewValue.CreateInstance().GetAllMods().ForEach(mod =>
{
if (mod.Ranked)
modsContainer.Add(new ModButton(mod));
});
foreach (var mod in modsContainer)
mod.OnSelectionChanged += selectionChanged;
modsContainer.ForEach(button => button.OnSelectionChanged += selectionChanged);
}
private void selectionChanged(Mod mod, bool selected)
@ -74,11 +75,39 @@ private void selectionChanged(Mod mod, bool selected)
else
mods.Remove(mod);
if (!mods.Any() && !IsHovered)
modsContainer.ForEach(button => button.Highlighted.Value = true);
SelectedMods.Value = mods;
}
protected override bool OnHover(HoverEvent e)
{
if (!SelectedMods.Value.Any())
dehighlightAll();
return base.OnHover(e);
}
protected override void OnHoverLost(HoverLostEvent e)
{
base.OnHoverLost(e);
if (!SelectedMods.Value.Any())
modsContainer.ForEach(mod => mod.Highlighted.Value = true);
}
public void DeselectAll() => modsContainer.ForEach(mod => mod.Selected.Value = false);
private void dehighlightAll()
{
modsContainer.ForEach(button =>
{
if (!button.IsHovered)
button.Highlighted.Value = false;
});
}
private class ModButton : ModIcon
{
private const float mod_scale = 0.4f;
@ -98,11 +127,13 @@ protected override void LoadComplete()
{
base.LoadComplete();
Highlighted.Value = true;
Selected.BindValueChanged(selected =>
{
updateState();
OnSelectionChanged?.Invoke(Mod, selected.NewValue);
}, true);
});
}
protected override bool OnClick(ClickEvent e)

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

@ -115,7 +115,7 @@ private void load(OsuColour colours)
protected override void LoadComplete()
{
base.LoadComplete();
Highlighted.BindValueChanged(OnHighlightedChange, true);
Highlighted.BindValueChanged(OnHighlightedChange);
}
protected virtual void OnHighlightedChange(ValueChangedEvent<bool> highlighted)