1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-23 20:20:16 +08:00

Merge branch 'master' into timingchange-rework

This commit is contained in:
Dean Herbert
2017-06-16 17:04:43 +09:00
committed by GitHub
Unverified
3 changed files with 3 additions and 1 deletions
@@ -45,6 +45,7 @@ namespace osu.Game.Graphics.UserInterface
case Key.Up:
case Key.Down:
return false;
case Key.KeypadEnter:
case Key.Enter:
if (!AllowCommit) return false;
break;
+1 -1
View File
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Dialog
{
if (args.Repeat) return false;
if (args.Key == Key.Enter)
if (args.Key == Key.Enter || args.Key == Key.KeypadEnter)
{
Buttons.OfType<PopupDialogOkButton>().FirstOrDefault()?.TriggerOnClick();
return true;
+1
View File
@@ -371,6 +371,7 @@ namespace osu.Game.Screens.Select
switch (args.Key)
{
case Key.KeypadEnter:
case Key.Enter:
raiseSelect();
return true;