[fix] Searching breaks setting value typing, enter key in string setting

kami-blue · Jan 12, 2021 · 254d6fc · 254d6fc
1 parent 486f276
commit 254d6fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/main/java/me/zeroeightsix/kami/gui/AbstractKamiGui.kt b/src/main/java/me/zeroeightsix/kami/gui/AbstractKamiGui.kt
@@ -235,6 +235,7 @@ abstract class AbstractKamiGui<S : SettingWindow<*>, E : Any> : GuiScreen() {
     }
 
     override fun keyTyped(typedChar: Char, keyCode: Int) {
+        if (settingWindow?.listeningChild != null) return
         when {
             keyCode == Keyboard.KEY_BACK || keyCode == Keyboard.KEY_DELETE -> {
                 typedString = ""

diff --git a/src/main/java/me/zeroeightsix/kami/gui/rgui/component/StringButton.kt b/src/main/java/me/zeroeightsix/kami/gui/rgui/component/StringButton.kt
@@ -59,6 +59,7 @@ class StringButton(val setting: StringSetting) : BooleanSlider(setting.name, 1.0
         if (keyState) {
             when (keyCode) {
                 Keyboard.KEY_RETURN -> {
+                    onStopListening(true)
                 }
                 Keyboard.KEY_BACK, Keyboard.KEY_DELETE -> {
                     name = name.substring(0, max(name.length - 1, 0))