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

Update framework

Browse Source
This commit is contained in:
Dean Herbert
2018-07-21 11:38:28 +09:00
parent 1796ffde14
commit 0f37758314
132 changed files with 183 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
View File

@ -9,14 +9,16 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.EventArgs;
using osu.Framework.Input.States;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Input;
using OpenTK.Graphics;
using OpenTK.Input;
using JoystickEventArgs = osu.Framework.Input.EventArgs.JoystickEventArgs;
namespace osu.Game.Overlays.KeyBinding
{
@ -230,7 +232,7 @@ namespace osu.Game.Overlays.KeyBinding
return true;
}
protected override bool OnJoystickPress(InputState state, Framework.Input.JoystickEventArgs args)
protected override bool OnJoystickPress(InputState state, JoystickEventArgs args)
{
if (!HasFocus)
return false;
@ -241,7 +243,7 @@ namespace osu.Game.Overlays.KeyBinding
return true;
}
protected override bool OnJoystickRelease(InputState state, Framework.Input.JoystickEventArgs args)
protected override bool OnJoystickRelease(InputState state, JoystickEventArgs args)
{
if (!HasFocus)
return base.OnJoystickRelease(state, args);