h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 21:13:01 +08:00
Code Issues Releases Wiki Activity

Implemented new interface which allows parent containers to decide on whether a "OnHover" sound should be played.

Browse Source
This commit is contained in:
FreezyLemon 2017-12-07 13:12:36 +01:00
parent f4f1291919
commit a8599a1b75
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Graphics/Containers/OsuClickableContainer.cs
View File

@ -8,7 +8,7 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Graphics.Containers
{
public class OsuClickableContainer : ClickableContainer
public class OsuClickableContainer : ClickableContainer, IHasHoverSounds
{
private readonly HoverSampleSet sampleSet;
@ -16,6 +16,8 @@ namespace osu.Game.Graphics.Containers
protected override Container<Drawable> Content => content;
public bool ShouldPlayHoverSound => true;
public OsuClickableContainer(HoverSampleSet sampleSet = HoverSampleSet.Normal)
{
this.sampleSet = sampleSet;

8
osu.Game/Graphics/UserInterface/HoverSounds.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
using static osu.Game.Online.Chat.ChatLink;
namespace osu.Game.Graphics.UserInterface
{
@ -30,7 +31,7 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnHover(InputState state)
{
sampleHover?.Play();
if ((Parent as IHasHoverSounds).ShouldPlayHoverSound) sampleHover?.Play();
return base.OnHover(state);
}
@ -50,4 +51,9 @@ namespace osu.Game.Graphics.UserInterface
[Description("-softer")]
Soft
}
public interface IHasHoverSounds
{
bool ShouldPlayHoverSound { get; }
}
}