sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
Huo Yaoyuan
2016-11-16 10:51:39 +08:00
parent 97005e033c da00c65e50
commit 53deaf2a00
141 changed files with 1566 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ using osu.Framework.Input;
using osu.Framework.Threading;
using OpenTK;
using osu.Framework.Allocation;
using osu.Framework.Graphics.Primitives;
namespace osu.Game.Graphics.UserInterface.Volume
{
@ -21,8 +22,6 @@ namespace osu.Game.Graphics.UserInterface.Volume
private FlowContainer content;
protected override Container<Drawable> Content => content;
public override bool Contains(Vector2 screenSpacePos) => true;
private void volumeChanged(object sender, EventArgs e)
{
Show();
@ -40,7 +39,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
AutoSizeAxes = Axes.Both,
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
Position = new Vector2(10, 30),
Margin = new MarginPadding { Left = 10, Right = 10, Top = 30, Bottom = 30 },
Spacing = new Vector2(15, 0),
});
}
@ -69,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;

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

@ -12,11 +12,11 @@ namespace osu.Game.Graphics.UserInterface.Volume
{
class VolumeControlReceptor : Container
{
public Action ActivateRequested;
public Action<InputState> 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;
}