diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs index 6c0315b9f1..26a8e7bf4f 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs @@ -22,8 +22,6 @@ namespace osu.Game.Graphics.UserInterface.Volume private FlowContainer content; protected override Container Content => content; - public override bool Contains(Vector2 screenSpacePos) => true; - private void volumeChanged(object sender, EventArgs e) { Show(); @@ -70,13 +68,15 @@ namespace osu.Game.Graphics.UserInterface.Volume base.Dispose(isDisposing); } - protected override bool OnWheel(InputState state) + public void Adjust(InputState state) { if (!IsVisible) - return false; + { + Show(); + return; + } volumeMeterMaster.TriggerWheel(state); - return true; } ScheduledDelegate popOutDelegate; diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs index 1c98aaa61d..d809450afb 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs @@ -12,11 +12,11 @@ namespace osu.Game.Graphics.UserInterface.Volume { class VolumeControlReceptor : Container { - public Action ActivateRequested; + public Action ActionRequested; protected override bool OnWheel(InputState state) { - ActivateRequested?.Invoke(); + ActionRequested?.Invoke(state); return true; } @@ -26,7 +26,7 @@ namespace osu.Game.Graphics.UserInterface.Volume { case Key.Up: case Key.Down: - ActivateRequested?.Invoke(); + ActionRequested?.Invoke(state); return true; } diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index bccaa398ff..024d6f07b0 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -91,7 +91,7 @@ namespace osu.Game new VolumeControlReceptor { RelativeSizeAxes = Axes.Both, - ActivateRequested = delegate { volume.Show(); } + ActionRequested = delegate(InputState state) { volume.Adjust(state); } }, mainContent = new Container {