h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-06 21:02:59 +08:00
Code Issues Releases Wiki Activity

Remove uneccesary cast, move enter OK button to one liner

Browse Source
This commit is contained in:
DrabWeb 2017-02-27 22:38:44 -04:00
parent 94f34b985b
commit bc7fd3bd39
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,26 +86,10 @@ namespace osu.Game.Overlays.Dialog
} }
} }
private PopupDialogOkButton okButton
{
get
{
foreach (PopupDialogButton b in Buttons)
{
if (b is PopupDialogOkButton)
return (PopupDialogOkButton)b;
}
return null;
}
}
private void pressButtonAtIndex(int index) private void pressButtonAtIndex(int index)
{ {
if (index < Buttons.Length) if (index < Buttons.Length)
{
Buttons[index].TriggerClick(); Buttons[index].TriggerClick();
}
} }
protected override bool OnKeyDown(Framework.Input.InputState state, Framework.Input.KeyDownEventArgs args) protected override bool OnKeyDown(Framework.Input.InputState state, Framework.Input.KeyDownEventArgs args)
@ -114,20 +98,20 @@ namespace osu.Game.Overlays.Dialog
if (args.Key == Key.Enter) if (args.Key == Key.Enter)
{ {
okButton?.TriggerClick(); Buttons.OfType<PopupDialogOkButton>()?.FirstOrDefault()?.TriggerClick();
return true; return true;
} }
// press button at number if 1-9 on number row or keypad are pressed // press button at number if 1-9 on number row or keypad are pressed
int k = (int)args.Key; var k = args.Key;
if (k >= (int)Key.Number1 && k <= (int)Key.Number9) if (k >= Key.Number1 && k <= Key.Number9)
{ {
pressButtonAtIndex(k - (int)Key.Number1); pressButtonAtIndex(k - Key.Number1);
return true; return true;
} }
else if (k >= (int)Key.Keypad1 && k <= (int)Key.Keypad9) else if (k >= Key.Keypad1 && k <= Key.Keypad9)
{ {
pressButtonAtIndex(k - (int)Key.Keypad1); pressButtonAtIndex(k - Key.Keypad1);
return true; return true;
} }