commit ddddabdccfdafffd8664fb4e29230dc4f848137e
author ocornut <omarcornut@gmail.com> Fri Sep 17 16:44:14 2021 +0200
committer ocornut <omarcornut@gmail.com> Fri Sep 17 16:44:14 2021 +0200
tree b3b0f8f24817ed8562dbd866d785c0cc342cc08d
parent 2cffcbdc64ee9301e473225fff697049697aac2d

InputText: amend validation test to allow pushing Activate events remotely. (#4552, #2321)

imgui_widgets.cpp

diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index 590cb4b..6e3f6f2 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -4257,7 +4257,7 @@
 
         // We allow validate/cancel with Nav source (gamepad) to makes it easier to undo an accidental NavInput press with no keyboard wired, but otherwise it isn't very useful.
         const bool is_validate_enter = IsKeyPressedMap(ImGuiKey_Enter) || IsKeyPressedMap(ImGuiKey_KeyPadEnter);
-        const bool is_validate_nav = (g.NavInputSource == ImGuiInputSource_Gamepad && IsNavInputTest(ImGuiNavInput_Activate, ImGuiInputReadMode_Pressed)) || IsNavInputTest(ImGuiNavInput_Input, ImGuiInputReadMode_Pressed);
+        const bool is_validate_nav = (IsNavInputTest(ImGuiNavInput_Activate, ImGuiInputReadMode_Pressed) && !IsKeyPressedMap(ImGuiKey_Space)) || IsNavInputTest(ImGuiNavInput_Input, ImGuiInputReadMode_Pressed);
         const bool is_cancel   = IsKeyPressedMap(ImGuiKey_Escape) || IsNavInputTest(ImGuiNavInput_Cancel, ImGuiInputReadMode_Pressed);
 
         if (IsKeyPressedMap(ImGuiKey_LeftArrow))                        { state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_LINESTART : is_wordmove_key_down ? STB_TEXTEDIT_K_WORDLEFT : STB_TEXTEDIT_K_LEFT) | k_mask); }