Skip to content

Commit

Permalink
InputText: Fixed using ImGuiInputTextFlags_Password with InputTextMul…
Browse files Browse the repository at this point in the history
…tiline(). (#3427, #3428)
  • Loading branch information
ocornut committed Aug 25, 2020
1 parent 5919a6f commit 32be6c0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions docs/CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ Other Changes:
- InputText: Added ImGuiInputTextFlags_CallbackEdit to modify internally owned buffer after an edit.
(note that InputText() already returns true on edit, the callback is useful mainly to manipulate the
underlying buffer while focus is active).
- InputText: Fixed using ImGuiInputTextFlags_Password with InputTextMultiline(). (#3427, #3428)
It is a rather unusual or useless combination of features but no reason it shouldn't work!
- DragFloat, DragScalar: Fixed ImGuiSliderFlags_ClampOnInput not being honored in the special case
where v_min == v_max. (#3361)
- BeginMenuBar: Fixed minor bug where CursorPosMax gets pushed to CursorPos prior to calling BeginMenuBar(),
Expand Down
6 changes: 3 additions & 3 deletions imgui_widgets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4505,16 +4505,16 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
}
}

if (is_password && !is_displaying_hint)
PopFont();

if (is_multiline)
{
Dummy(text_size + ImVec2(0.0f, g.FontSize)); // Always add room to scroll an extra line
EndChild();
EndGroup();
}

if (is_password && !is_displaying_hint)
PopFont();

// Log as text
if (g.LogEnabled && (!is_password || is_displaying_hint))
LogRenderedText(&draw_pos, buf_display, buf_display_end);
Expand Down

0 comments on commit 32be6c0

Please sign in to comment.