From 6e379f0646cb531798fa24243dc3a5e273cfd72c Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 22 Mar 2018 15:54:16 +0900 Subject: [PATCH 1/3] Fix FocusedTextBox in line with framework changes --- osu.Game/Graphics/UserInterface/FocusedTextBox.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs index 6d9bf231c3..9ff64e5d5f 100644 --- a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs +++ b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs @@ -30,6 +30,8 @@ namespace osu.Game.Graphics.UserInterface } } + public override bool HandleKeyboardInput => HoldFocus || base.HandleKeyboardInput; + protected override void OnFocus(InputState state) { base.OnFocus(state); From 9f220b3b9b2ef28e9cb805cdd87716b962b47862 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Thu, 22 Mar 2018 18:51:03 +0900 Subject: [PATCH 2/3] Add explanatory comment --- osu.Game/Graphics/UserInterface/FocusedTextBox.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs index 9ff64e5d5f..33786252ab 100644 --- a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs +++ b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs @@ -30,6 +30,7 @@ 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) From f87c3765474310dea7ac0addf4f757da0c336bb8 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Thu, 22 Mar 2018 18:52:32 +0900 Subject: [PATCH 3/3] Update framework --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index cc39713fbf..241133f0a6 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit cc39713fbf9427aa53df91e27ecd09d15661089f +Subproject commit 241133f0a65326a563ba23b7166167a882d1d5cb