Merge branch 'master' into skin--completion

ppy · Mar 22, 2018 · 2d08cee · 2d08cee
2 parents af65f2d + 242ee8f
commit 2d08cee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/osu-framework b/osu-framework
diff --git a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
@@ -30,6 +30,9 @@ public bool HoldFocus
             }
         }
 
+        // 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);