sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ruleset-keybindings

Browse Source
This commit is contained in:
ocboogie
2018-05-12 16:40:27 -07:00
committed by GitHub
parent 8a5bd27c20 9515eb4281
commit 76800421c4
4 changed files with 70 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,6 +223,26 @@ namespace osu.Game.Overlays.KeyBinding
return true;
}
protected override bool OnJoystickPress(InputState state, Framework.Input.JoystickEventArgs args)
{
if (!HasFocus)
return false;
bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(state));
finalise();
return true;
}
protected override bool OnJoystickRelease(InputState state, Framework.Input.JoystickEventArgs args)
{
if (!HasFocus)
return base.OnJoystickRelease(state, args);
finalise();
return true;
}
private void finalise()
{
if (bindTarget != null)