Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) (ocornut#787). Thanks @Grouflon

ocornut · ocornut · commit f3ab5e6252ec · 2017-08-22T19:43:49.000+08:00
diff --git a/imgui.cpp b/imgui.cpp
@@ -8932,7 +8932,11 @@ bool ImGui::InputTextEx(const char* label, char* buf, int buf_size, const ImVec2
                 value_changed = true;
             }
         }
-        if (!cancel_edit && !clear_active_id)
+
+        // When using 'ImGuiInputTextFlags_EnterReturnsTrue' as a special case we reapply the live buffer back to the input buffer before clearing ActiveId, even though strictly speaking it wasn't modified on this frame.
+        // If we didn't do that, code like InputInt() with ImGuiInputTextFlags_EnterReturnsTrue would fail. Also this allows the user to use InputText() with ImGuiInputTextFlags_EnterReturnsTrue without maintaining any user-side storage.
+        bool apply_edit_back_to_user_buffer = !cancel_edit || (enter_pressed && (flags & ImGuiInputTextFlags_EnterReturnsTrue) != 0);
+        if (apply_edit_back_to_user_buffer)
         {
             // Apply new value immediately - copy modified buffer back
             // Note that as soon as the input box is active, the in-widget value gets priority over any underlying modification of the input buffer

Original file line number	Diff line number	Diff line change
`@@ -8932,7 +8932,11 @@ bool ImGui::InputTextEx(const char* label, char* buf, int buf_size, const ImVec2`
`8932`	`8932`	`value_changed = true;`
`8933`	`8933`	`}`
`8934`	`8934`	`}`
`8935`		`- if (!cancel_edit && !clear_active_id)`
	`8935`	`+`
	`8936`	`+ // When using 'ImGuiInputTextFlags_EnterReturnsTrue' as a special case we reapply the live buffer back to the input buffer before clearing ActiveId, even though strictly speaking it wasn't modified on this frame.`
	`8937`	`+ // If we didn't do that, code like InputInt() with ImGuiInputTextFlags_EnterReturnsTrue would fail. Also this allows the user to use InputText() with ImGuiInputTextFlags_EnterReturnsTrue without maintaining any user-side storage.`
	`8938`	`+ bool apply_edit_back_to_user_buffer = !cancel_edit \|\| (enter_pressed && (flags & ImGuiInputTextFlags_EnterReturnsTrue) != 0);`
	`8939`	`+ if (apply_edit_back_to_user_buffer)`
`8936`	`8940`	`{`
`8937`	`8941`	`// Apply new value immediately - copy modified buffer back`
`8938`	`8942`	`// Note that as soon as the input box is active, the in-widget value gets priority over any underlying modification of the input buffer`