Don't unfocus textbox while pressing tab

minecraft-linux · Feb 16, 2024 · 8464ca9 · 8464ca9
1 parent 43be7df
commit 8464ca9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/window_callbacks.cpp b/src/window_callbacks.cpp
@@ -215,10 +215,13 @@ void WindowCallbacks::onKeyboard(KeyCode key, KeyAction action) {
             return;
         }
 
-        if(action == KeyAction::PRESS && jniSupport.getTextInputHandler().isEnabled() && !jniSupport.getTextInputHandler().isMultiline() && (key == KeyCode::TAB || key == KeyCode::UP || key == KeyCode::DOWN)) {
+
+        if(action == KeyAction::PRESS && jniSupport.getTextInputHandler().isEnabled() && !jniSupport.getTextInputHandler().isMultiline() && (lastKey == KeyCode::TAB || lastKey == KeyCode::UP || lastKey == KeyCode::DOWN) && !(key == KeyCode::TAB || key == KeyCode::UP || key == KeyCode::DOWN)) {
             jniSupport.onBackPressed();
         }
 
+        lastKey = key;
+
         if(action == KeyAction::PRESS)
             inputQueue.addEvent(FakeKeyEvent(AKEY_EVENT_ACTION_DOWN, mapMinecraftToAndroidKey(key)));
         else if(action == KeyAction::RELEASE)

diff --git a/src/window_callbacks.h b/src/window_callbacks.h
@@ -21,6 +21,7 @@ class WindowCallbacks {
     FakeInputQueue &inputQueue;
     std::unordered_map<int, GamepadData> gamepads;
     int32_t buttonState = 0;
+    KeyCode lastKey = (KeyCode)0;
     bool useDirectMouseInput, useDirectKeyboardInput;
     bool modCTRL = false;
     bool needsQueueGamepadInput = true;