commit c8cde28cf3fb5d1e86faa80edf9b2c48ccc2f8dc
author omar <omarcornut@gmail.com> Wed May 20 17:56:08 2020 +0200
committer omar <omarcornut@gmail.com> Wed May 20 17:56:08 2020 +0200
tree 290d3cd541996527f657e3f78586de5c259bd3dc
parent f44962c01a0e5f5fdf9652cb28e775838fe0dbbc

IO: AddInputCharacters function ignore 0 input. (#3252)

Amend ef13d954 + c8ea0a01 (#2541, #2538, #2815)

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index 726b05f..6a98484 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -1142,17 +1142,21 @@
 // - on Windows you can get those using ToAscii+keyboard state, or via the WM_CHAR message
 void ImGuiIO::AddInputCharacter(unsigned int c)
 {
-    InputQueueCharacters.push_back(c > 0 && c <= IM_UNICODE_CODEPOINT_MAX ? (ImWchar)c : IM_UNICODE_CODEPOINT_INVALID);
+    if (c != 0)
+        InputQueueCharacters.push_back(c <= IM_UNICODE_CODEPOINT_MAX ? (ImWchar)c : IM_UNICODE_CODEPOINT_INVALID);
 }
 
 // UTF16 strings use surrogate pairs to encode codepoints >= 0x10000, so
 // we should save the high surrogate.
 void ImGuiIO::AddInputCharacterUTF16(ImWchar16 c)
 {
+    if (c == 0 && InputQueueSurrogate == 0)
+        return;
+
     if ((c & 0xFC00) == 0xD800) // High surrogate, must save
     {
         if (InputQueueSurrogate != 0)
-            InputQueueCharacters.push_back(0xFFFD);
+            InputQueueCharacters.push_back(IM_UNICODE_CODEPOINT_INVALID);
         InputQueueSurrogate = c;
         return;
     }
@@ -1177,7 +1181,7 @@
     {
         unsigned int c = 0;
         utf8_chars += ImTextCharFromUtf8(&c, utf8_chars, NULL);
-        if (c > 0)
+        if (c != 0)
             InputQueueCharacters.push_back((ImWchar)c);
     }
 }