From faa805e437c967836c39616bb8d1c1f778f3356b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 9 Feb 2017 12:33:24 +0900 Subject: [PATCH] Fix SearchTextBox's handling of keyboard input to allow for IME input. --- osu-framework | 2 +- osu.Game/Screens/Select/SearchTextBox.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index a2b6ea81a6..763a13f90e 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit a2b6ea81a6dcfbb28ed7d85c7f54d33d48a00fa7 +Subproject commit 763a13f90e018f4ba9401566b381b3338a969512 diff --git a/osu.Game/Screens/Select/SearchTextBox.cs b/osu.Game/Screens/Select/SearchTextBox.cs index d6385d463a..4cd5353712 100644 --- a/osu.Game/Screens/Select/SearchTextBox.cs +++ b/osu.Game/Screens/Select/SearchTextBox.cs @@ -74,6 +74,8 @@ namespace osu.Game.Screens.Select protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) { + if (HandlePendingText(state)) return true; + if (!state.Keyboard.ControlPressed && !state.Keyboard.ShiftPressed) { switch (args.Key)