From 4fc2cd227cf82acdef0aa54b44a5c58b765e90f1 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 9 Feb 2017 10:35:25 +0900 Subject: [PATCH 1/2] Add CJK support via font Noto Medium. --- osu-framework | 2 +- osu-resources | 2 +- osu.Game/OsuGameBase.cs | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/osu-framework b/osu-framework index b5c6c38245..a2b6ea81a6 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit b5c6c38245730f80ca9db4793e106f31760dc62d +Subproject commit a2b6ea81a6dcfbb28ed7d85c7f54d33d48a00fa7 diff --git a/osu-resources b/osu-resources index c03414fd4e..2a3dd3f3dd 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit c03414fd4e9ffd99ab5641ac9a15ee21f3976b55 +Subproject commit 2a3dd3f3dd68fe52b779d0fdded3ce444897efee diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index eae1b23bcb..db546ac088 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -52,6 +52,8 @@ namespace osu.Game Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Medium")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-MediumItalic")); + Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Noto")); + Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Regular")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-RegularItalic")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-SemiBold")); From faa805e437c967836c39616bb8d1c1f778f3356b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 9 Feb 2017 12:33:24 +0900 Subject: [PATCH 2/2] 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)