h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 23:05:37 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into skin--completion

Browse Source
This commit is contained in:
Dean Herbert 2018-03-22 19:04:22 +09:00 committed by GitHub
commit 2d08cee3b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit cc39713fbf9427aa53df91e27ecd09d15661089f
Subproject commit 241133f0a65326a563ba23b7166167a882d1d5cb

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

@ -30,6 +30,9 @@ namespace osu.Game.Graphics.UserInterface
}
}
// We may not be focused yet, but we need to handle keyboard input to be able to request focus
public override bool HandleKeyboardInput => HoldFocus || base.HandleKeyboardInput;
protected override void OnFocus(InputState state)
{
base.OnFocus(state);