RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-06 22:30:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into timingchange-rework

Browse Source
This commit is contained in:
Dean Herbert 2017-06-16 17:04:43 +09:00 committed by GitHub
commit f2cac17188
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Graphics/UserInterface/SearchTextBox.cs
View File

@ -45,6 +45,7 @@ namespace osu.Game.Graphics.UserInterface
case Key.Up: case Key.Up:
case Key.Down: case Key.Down:
return false; return false;
case Key.KeypadEnter:
case Key.Enter: case Key.Enter:
if (!AllowCommit) return false; if (!AllowCommit) return false;
break; break;

2
osu.Game/Overlays/Dialog/PopupDialog.cs
View File

@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Dialog
{ {
if (args.Repeat) return false; if (args.Repeat) return false;
if (args.Key == Key.Enter) if (args.Key == Key.Enter || args.Key == Key.KeypadEnter)
{ {
Buttons.OfType<PopupDialogOkButton>().FirstOrDefault()?.TriggerOnClick(); Buttons.OfType<PopupDialogOkButton>().FirstOrDefault()?.TriggerOnClick();
return true; return true;

1
osu.Game/Screens/Select/SongSelect.cs
View File

@ -371,6 +371,7 @@ namespace osu.Game.Screens.Select
switch (args.Key) switch (args.Key)
{ {
case Key.KeypadEnter:
case Key.Enter: case Key.Enter:
raiseSelect(); raiseSelect();
return true; return true;