mirror of https://github.com/ppy/osu
Consume new debounce logic in carousel header
This commit is contained in:
parent
970039b7e3
commit
cd01591dda
|
@ -13,6 +13,7 @@
|
||||||
using osu.Framework.Input.Events;
|
using osu.Framework.Input.Events;
|
||||||
using osu.Framework.Utils;
|
using osu.Framework.Utils;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
|
using osu.Game.Graphics.UserInterface;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
using osuTK.Graphics;
|
using osuTK.Graphics;
|
||||||
|
|
||||||
|
@ -20,10 +21,6 @@ namespace osu.Game.Screens.Select.Carousel
|
||||||
{
|
{
|
||||||
public class CarouselHeader : Container
|
public class CarouselHeader : Container
|
||||||
{
|
{
|
||||||
private SampleChannel sampleHover;
|
|
||||||
|
|
||||||
private readonly Box hoverLayer;
|
|
||||||
|
|
||||||
public Container BorderContainer;
|
public Container BorderContainer;
|
||||||
|
|
||||||
public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
|
public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
|
||||||
|
@ -44,23 +41,11 @@ public CarouselHeader()
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
Content,
|
Content,
|
||||||
hoverLayer = new Box
|
new HoverLayer()
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Alpha = 0,
|
|
||||||
Blending = BlendingParameters.Additive,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(AudioManager audio, OsuColour colours)
|
|
||||||
{
|
|
||||||
sampleHover = audio.Samples.Get("SongSelect/song-ping");
|
|
||||||
hoverLayer.Colour = colours.Blue.Opacity(0.1f);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void LoadComplete()
|
protected override void LoadComplete()
|
||||||
{
|
{
|
||||||
base.LoadComplete();
|
base.LoadComplete();
|
||||||
|
@ -97,22 +82,50 @@ private void updateState(ValueChangedEvent<CarouselItemState> state)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override bool OnHover(HoverEvent e)
|
public class HoverLayer : HoverSampleDebounceComponent
|
||||||
{
|
{
|
||||||
if (sampleHover != null)
|
private SampleChannel sampleHover;
|
||||||
|
|
||||||
|
private Box box;
|
||||||
|
|
||||||
|
public HoverLayer()
|
||||||
{
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both;
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load(AudioManager audio, OsuColour colours)
|
||||||
|
{
|
||||||
|
InternalChild = box = new Box
|
||||||
|
{
|
||||||
|
Colour = colours.Blue.Opacity(0.1f),
|
||||||
|
Alpha = 0,
|
||||||
|
Blending = BlendingParameters.Additive,
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
};
|
||||||
|
|
||||||
|
sampleHover = audio.Samples.Get("SongSelect/song-ping");
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override bool OnHover(HoverEvent e)
|
||||||
|
{
|
||||||
|
box.FadeIn(100, Easing.OutQuint);
|
||||||
|
return base.OnHover(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnHoverLost(HoverLostEvent e)
|
||||||
|
{
|
||||||
|
box.FadeOut(1000, Easing.OutQuint);
|
||||||
|
base.OnHoverLost(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void PlayHoverSample()
|
||||||
|
{
|
||||||
|
if (sampleHover == null) return;
|
||||||
|
|
||||||
sampleHover.Frequency.Value = 0.90 + RNG.NextDouble(0.2);
|
sampleHover.Frequency.Value = 0.90 + RNG.NextDouble(0.2);
|
||||||
sampleHover.Play();
|
sampleHover.Play();
|
||||||
}
|
}
|
||||||
|
|
||||||
hoverLayer.FadeIn(100, Easing.OutQuint);
|
|
||||||
return base.OnHover(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnHoverLost(HoverLostEvent e)
|
|
||||||
{
|
|
||||||
hoverLayer.FadeOut(1000, Easing.OutQuint);
|
|
||||||
base.OnHoverLost(e);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue