sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 00:09:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up escape handling

Browse Source
This commit is contained in:
Dean Herbert
2018-06-27 16:06:26 +09:00
parent 8cf1553fd5
commit 6a80a21078
7 changed files with 37 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Graphics/UserInterface/FocusedTextBox.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Framework.Input;
using System;
@ -26,6 +25,7 @@ namespace osu.Game.Graphics.UserInterface
{
focus = value;
if (!focus && HasFocus)
//todo: replace with KillInput after ppy/osu-framework#1656 is merged.
GetContainingInputManager().ChangeFocus(null);
}
}
@ -39,18 +39,10 @@ namespace osu.Game.Graphics.UserInterface
BorderThickness = 0;
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
protected override void KillFocus()
{
if (!args.Repeat && args.Key == Key.Escape)
{
if (Text.Length > 0)
Text = string.Empty;
else
Exit?.Invoke();
return true;
}
return base.OnKeyDown(state, args);
base.KillFocus();
Exit?.Invoke();
}
public override bool RequestsFocus => HoldFocus;