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

InputText() update its width in case of resize initiated programmatically

Browse Source
This commit is contained in:
ocornut 2015-03-19 16:40:59 +00:00
parent 693bd56db2
commit d1aca79f4e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imgui.cpp
View File

@ -5875,14 +5875,15 @@ bool ImGui::InputText(const char* label, char* buf, size_t buf_size, ImGuiInputT
if (g.ActiveId == id) if (g.ActiveId == id)
{ {
// Edit in progress // Edit in progress
edit_state.Width = w + style.FramePadding.x;
edit_state.BufSizeA = buf_size; edit_state.BufSizeA = buf_size;
edit_state.Font = window->Font(); edit_state.Font = window->Font();
edit_state.FontSize = window->FontSize(); edit_state.FontSize = window->FontSize();
edit_state.UpdateScrollOffset();
const float mx = g.IO.MousePos.x - frame_bb.Min.x - style.FramePadding.x; const float mx = g.IO.MousePos.x - frame_bb.Min.x - style.FramePadding.x;
const float my = window->FontSize()*0.5f; // Flatten mouse because we are doing a single-line edit const float my = window->FontSize()*0.5f; // Flatten mouse because we are doing a single-line edit
edit_state.UpdateScrollOffset();
if (select_all || (hovered && io.MouseDoubleClicked[0])) if (select_all || (hovered && io.MouseDoubleClicked[0]))
{ {
edit_state.SelectAll(); edit_state.SelectAll();
@ -5892,7 +5893,6 @@ bool ImGui::InputText(const char* label, char* buf, size_t buf_size, ImGuiInputT
{ {
stb_textedit_click(&edit_state, &edit_state.StbState, mx + edit_state.ScrollX, my); stb_textedit_click(&edit_state, &edit_state.StbState, mx + edit_state.ScrollX, my);
edit_state.CursorAnimReset(); edit_state.CursorAnimReset();
} }
else if (io.MouseDown[0] && !edit_state.SelectedAllMouseLock) else if (io.MouseDown[0] && !edit_state.SelectedAllMouseLock)
{ {
@ -6083,7 +6083,9 @@ bool ImGui::InputText(const char* label, char* buf, size_t buf_size, ImGuiInputT
} }
} }
ImGuiTextEditState::RenderTextScrolledClipped(window->Font(), window->FontSize(), buf, frame_bb.Min + style.FramePadding, w + style.FramePadding.x, (g.ActiveId == id) ? edit_state.ScrollX : 0.0f); const float render_scroll_x = (g.ActiveId == id) ? edit_state.ScrollX : 0.0f;
//const float render_scroll_x = (edit_state.Id == id) ? edit_state.ScrollX : 0.0f;
ImGuiTextEditState::RenderTextScrolledClipped(window->Font(), window->FontSize(), buf, frame_bb.Min + style.FramePadding, w + style.FramePadding.x, render_scroll_x);
if (g.ActiveId == id) if (g.ActiveId == id)
{ {