h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-23 19:07:20 +08:00
Code Issues Releases Wiki Activity

Switched back to switch

Browse Source
This commit is contained in:
aQaTL 2018-04-18 15:06:03 +02:00
parent 90beff83f6
commit 1dc8986c22
No known key found for this signature in database
GPG Key ID: 181719411A8555F0
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,22 +198,25 @@ namespace osu.Game.Overlays.KeyBinding
if (!HasFocus)
return false;
KeyCombination keyCombination = KeyCombination.FromInputState(state);
if (keyCombination.Equals(InputKey.Escape))
switch (args.Key)
{
finalise();
return true;
case Key.Escape:
finalise();
return true;
case Key.Delete:
{
if (state.Keyboard.ShiftPressed)
{
bindTarget.UpdateKeyCombination(InputKey.None);
finalise();
return true;
}
break;
}
}
if (keyCombination.Equals(new[] { InputKey.Shift, InputKey.Delete }))
{
bindTarget.UpdateKeyCombination(InputKey.None);
finalise();
return true;
}
bindTarget.UpdateKeyCombination(keyCombination);
bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(state));
if (!isModifier(args.Key)) finalise();
return true;