Skip to content

Commit

Permalink
InputTextMultiline: Fixed label size not being included into window c…
Browse files Browse the repository at this point in the history
…ontents rect unless the whole widget is clipped.
  • Loading branch information
ocornut committed Aug 23, 2021
1 parent 68f428b commit 0608887
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions docs/CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ Breaking Changes:

Other Changes:

- InputTextMultiline: Fixed label size not being included into window contents rect unless
the whole widget is clipped.
- imgui_freetype: Fixed crash when FT_Render_Glyph() fails to render a glyph and returns NULL
(which apparently happens with Freetype 2.11). (#4394, #4145?).

Expand Down
4 changes: 3 additions & 1 deletion imgui_widgets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3969,13 +3969,15 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
ImGuiItemStatusFlags item_status_flags = 0;
if (is_multiline)
{
ImVec2 backup_pos = window->DC.CursorPos;
ItemSize(total_bb, style.FramePadding.y);
if (!ItemAdd(total_bb, id, &frame_bb, ImGuiItemAddFlags_Focusable))
{
ItemSize(total_bb, style.FramePadding.y);
EndGroup();
return false;
}
item_status_flags = g.LastItemData.StatusFlags;
window->DC.CursorPos = backup_pos;

// We reproduce the contents of BeginChildFrame() in order to provide 'label' so our window internal data are easier to read/debug.
PushStyleColor(ImGuiCol_ChildBg, style.Colors[ImGuiCol_FrameBg]);
Expand Down

0 comments on commit 0608887

Please sign in to comment.