Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 01:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

InputText: Improved sturdiness if the ResizeCallback purposefully modify data->BufTextLen or data->BufSize. (#2006, #1443, #1008)

Browse Source
This commit is contained in:
omar 2018-08-22 21:26:38 +02:00
parent 7d9d9bc34e
commit 7011d87bf8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
imgui.cpp
View File

@ -11163,15 +11163,18 @@ bool ImGui::InputTextEx(const char* label, char* buf, int buf_size, const ImVec2
callback_data.EventFlag = ImGuiInputTextFlags_CallbackResize; callback_data.EventFlag = ImGuiInputTextFlags_CallbackResize;
callback_data.Flags = flags; callback_data.Flags = flags;
callback_data.Buf = buf; callback_data.Buf = buf;
callback_data.BufTextLen = edit_state.CurLenA; callback_data.BufTextLen = apply_new_text_length;
callback_data.BufSize = ImMax(buf_size, apply_new_text_length + 1); callback_data.BufSize = ImMax(buf_size, apply_new_text_length + 1);
callback_data.UserData = callback_user_data; callback_data.UserData = callback_user_data;
callback(&callback_data); callback(&callback_data);
buf = callback_data.Buf; buf = callback_data.Buf;
buf_size = callback_data.BufSize; buf_size = callback_data.BufSize;
} apply_new_text_length = ImMin(callback_data.BufTextLen, buf_size - 1);
IM_ASSERT(apply_new_text_length <= buf_size); IM_ASSERT(apply_new_text_length <= buf_size);
ImStrncpy(buf, edit_state.TempBuffer.Data, apply_new_text_length + 1); }
// If the underlying buffer resize was denied or not carried to the next frame, apply_new_text_length+1 may be >= buf_size.
ImStrncpy(buf, edit_state.TempBuffer.Data, ImMin(apply_new_text_length + 1, buf_size));
value_changed = true; value_changed = true;
} }

2
misc/stl/imgui_stl.cpp
View File

@ -34,6 +34,7 @@ static int InputTextCallback(ImGuiInputTextCallbackData* data)
bool ImGui::InputText(const char* label, std::string* str, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) bool ImGui::InputText(const char* label, std::string* str, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
{ {
IM_ASSERT((flags & ImGuiInputTextFlags_CallbackResize) == 0);
flags |= ImGuiInputTextFlags_CallbackResize; flags |= ImGuiInputTextFlags_CallbackResize;
InputTextCallback_UserData cb_user_data; InputTextCallback_UserData cb_user_data;
@ -45,6 +46,7 @@ bool ImGui::InputText(const char* label, std::string* str, ImGuiInputTextFlags f
bool ImGui::InputTextMultiline(const char* label, std::string* str, const ImVec2& size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) bool ImGui::InputTextMultiline(const char* label, std::string* str, const ImVec2& size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
{ {
IM_ASSERT((flags & ImGuiInputTextFlags_CallbackResize) == 0);
flags |= ImGuiInputTextFlags_CallbackResize; flags |= ImGuiInputTextFlags_CallbackResize;
InputTextCallback_UserData cb_user_data; InputTextCallback_UserData cb_user_data;