mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-08-06 13:38:55 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Removing useless check introduced in b0d172

Browse Source
This commit is contained in:
Lucas Lazare 2019-03-05 12:17:27 -05:00
parent 8afd7a2b45
commit 219bdfcb7f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imgui_widgets.cpp
View File

@ -2903,7 +2903,7 @@ bool ImGui::InputTextMultiline(const char* label, char* buf, size_t buf_size, co
bool ImGui::InputTextHinted(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) bool ImGui::InputTextHinted(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
{ {
return InputTextEx(label, hint, buf, (int)buf_size, ImVec2(0,0), flags, callback, user_data); return InputTextEx(label, hint, buf, (int)buf_size, ImVec2(0,0), flags, callback, user_data);
} }
static int InputTextCalcTextLenAndLineCount(const char* text_begin, const char** out_text_end) static int InputTextCalcTextLenAndLineCount(const char* text_begin, const char** out_text_end)
@ -3871,8 +3871,8 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
} }
else else
{ {
buf_display = hint; buf_display = hint;
buf_display_end = hint + strlen(hint); buf_display_end = hint + strlen(hint);
text_color = ImGuiCol_TextDisabled; text_color = ImGuiCol_TextDisabled;
} }
@ -3904,7 +3904,7 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
// Render text only (no selection, no cursor) // Render text only (no selection, no cursor)
text_color = ImGuiCol_Text; text_color = ImGuiCol_Text;
buf_display = (g.ActiveId == id && !is_readonly && state->TextAIsValid) ? state->TextA.Data : buf; buf_display = (g.ActiveId == id && !is_readonly && state->TextAIsValid) ? state->TextA.Data : buf;
if (is_multiline && buf_display) if (is_multiline)
text_size = ImVec2(size.x, InputTextCalcTextLenAndLineCount(buf_display, &buf_display_end) * g.FontSize); // We don't need width text_size = ImVec2(size.x, InputTextCalcTextLenAndLineCount(buf_display, &buf_display_end) * g.FontSize); // We don't need width
else if (g.ActiveId == id) else if (g.ActiveId == id)
buf_display_end = buf_display + state->CurLenA; buf_display_end = buf_display + state->CurLenA;