Apply rebased changes

This commit is contained in:
Dean Herbert
2019-06-07 11:45:58 +09:00
parent 358a08cf9d
commit 64d5aa318f
2 changed files with 234 additions and 12 deletions

View File

@ -24,11 +24,13 @@ namespace osu.Game.Graphics.Containers
{
Enabled.ValueChanged += e =>
{
if (e.NewValue && isHovered)
fadeIn();
if (!e.NewValue)
unhover();
if (isHovered)
{
if (e.NewValue)
fadeIn();
else
fadeOut();
}
};
}
@ -36,6 +38,9 @@ namespace osu.Game.Graphics.Containers
protected override bool OnHover(HoverEvent e)
{
if (isHovered)
return false;
isHovered = true;
if (!Enabled.Value)
@ -47,18 +52,14 @@ namespace osu.Game.Graphics.Containers
}
protected override void OnHoverLost(HoverLostEvent e)
{
unhover();
base.OnHoverLost(e);
}
private void unhover()
{
if (!isHovered)
return;
isHovered = false;
EffectTargets.ForEach(d => d.FadeColour(IdleColour, FADE_DURATION, Easing.OutQuint));
fadeOut();
base.OnHoverLost(e);
}
[BackgroundDependencyLoader]
@ -78,5 +79,10 @@ namespace osu.Game.Graphics.Containers
{
EffectTargets.ForEach(d => d.FadeColour(HoverColour, FADE_DURATION, Easing.OutQuint));
}
private void fadeOut()
{
EffectTargets.ForEach(d => d.FadeColour(IdleColour, FADE_DURATION, Easing.OutQuint));
}
}
}