sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Change volume control mouse wheel behaviour to not gain full-screen focus.

Browse Source
This commit is contained in:
Dean Herbert
2016-11-15 15:22:14 +09:00
parent ff20053e79
commit 867797a089
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -22,8 +22,6 @@ namespace osu.Game.Graphics.UserInterface.Volume
private FlowContainer content; private FlowContainer content;
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
public override bool Contains(Vector2 screenSpacePos) => true;
private void volumeChanged(object sender, EventArgs e) private void volumeChanged(object sender, EventArgs e)
{ {
Show(); Show();
@ -70,13 +68,15 @@ namespace osu.Game.Graphics.UserInterface.Volume
base.Dispose(isDisposing); base.Dispose(isDisposing);
} }
protected override bool OnWheel(InputState state) public void Adjust(InputState state)
{ {
if (!IsVisible) if (!IsVisible)
return false; {
Show();
return;
}
volumeMeterMaster.TriggerWheel(state); volumeMeterMaster.TriggerWheel(state);
return true;
} }
ScheduledDelegate popOutDelegate; ScheduledDelegate popOutDelegate;

6
osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs
View File

@ -12,11 +12,11 @@ namespace osu.Game.Graphics.UserInterface.Volume
{ {
class VolumeControlReceptor : Container class VolumeControlReceptor : Container
{ {
public Action ActivateRequested; public Action<InputState> ActionRequested;
protected override bool OnWheel(InputState state) protected override bool OnWheel(InputState state)
{ {
ActivateRequested?.Invoke(); ActionRequested?.Invoke(state);
return true; return true;
} }
@ -26,7 +26,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
{ {
case Key.Up: case Key.Up:
case Key.Down: case Key.Down:
ActivateRequested?.Invoke(); ActionRequested?.Invoke(state);
return true; return true;
} }

2
osu.Game/OsuGame.cs
View File

@ -91,7 +91,7 @@ namespace osu.Game
new VolumeControlReceptor new VolumeControlReceptor
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
ActivateRequested = delegate { volume.Show(); } ActionRequested = delegate(InputState state) { volume.Adjust(state); }
}, },
mainContent = new Container mainContent = new Container
{ {