h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 00:42:55 +08:00
Code Issues Releases Wiki Activity

Move modified key conditional location.

Browse Source
This commit is contained in:
smoogipooo 2017-03-03 14:08:37 +09:00
parent 8d41d1460a
commit e6d911e49b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Menu/Button.cs
View File

@ -257,9 +257,10 @@ namespace osu.Game.Screens.Menu
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
if (args.Repeat) return false;
if (args.Repeat || state.Keyboard.ControlPressed || state.Keyboard.ShiftPressed || state.Keyboard.AltPressed)
return false;
if (triggerKey == args.Key && triggerKey != Key.Unknown && !(state.Keyboard.ControlPressed || state.Keyboard.ShiftPressed || state.Keyboard.AltPressed))
if (triggerKey == args.Key && triggerKey != Key.Unknown)
{
trigger();
return true;