From 254d6fc1f6ecf869fc3f587801559f41cad90a9a Mon Sep 17 00:00:00 2001 From: Xiaro <62033805+Xiaro@users.noreply.github.com> Date: Tue, 12 Jan 2021 10:41:46 -0500 Subject: [PATCH] [fix] Searching breaks setting value typing, enter key in string setting --- src/main/java/me/zeroeightsix/kami/gui/AbstractKamiGui.kt | 1 + .../java/me/zeroeightsix/kami/gui/rgui/component/StringButton.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/me/zeroeightsix/kami/gui/AbstractKamiGui.kt b/src/main/java/me/zeroeightsix/kami/gui/AbstractKamiGui.kt index 1fdcd5e00..91fd9745e 100644 --- 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, 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 index 2f6afac3f..7d50018c6 100644 --- 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))