mirror of
https://github.com/ocornut/imgui.git
synced 2025-09-07 11:58:22 +00:00
InputText, InputInt, InputFloat: fixed an issue where using Escape to revert would not write back the reverted value. (#8915, #8273)
Revealed by 00f12b9a0
Regression test: "widgets_inputtext_temp_buffer_2"
This commit is contained in:
@@ -55,6 +55,10 @@ Other Changes:
|
|||||||
- Nav: fixed Ctrl+Tab window appearing as empty when the sole active and focused
|
- Nav: fixed Ctrl+Tab window appearing as empty when the sole active and focused
|
||||||
window has the ImGuiWindowFlags_NoNavFocus flag. (#8914)
|
window has the ImGuiWindowFlags_NoNavFocus flag. (#8914)
|
||||||
- Bullet: fixed tesselation amount which looked out of place in very large sizes.
|
- Bullet: fixed tesselation amount which looked out of place in very large sizes.
|
||||||
|
- InputText, InputInt, InputFloat: fixed an issue where using Escape to revert
|
||||||
|
would not write back the reverted value during the IsItemDeactivatedAfterEdit()
|
||||||
|
frame if the provided input buffer doesn't store temporary edits.
|
||||||
|
(regression in 1.91.7) (#8915, #8273)
|
||||||
- InputText: allow passing an empty string with buf_size==0. (#8907)
|
- InputText: allow passing an empty string with buf_size==0. (#8907)
|
||||||
In theory the buffer size should always account for a zero-terminator, but idioms
|
In theory the buffer size should always account for a zero-terminator, but idioms
|
||||||
such as using InputTextMultiline() with ImGuiInputTextFlags_ReadOnly to display
|
such as using InputTextMultiline() with ImGuiInputTextFlags_ReadOnly to display
|
||||||
|
2
imgui.h
2
imgui.h
@@ -29,7 +29,7 @@
|
|||||||
// Library Version
|
// Library Version
|
||||||
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345')
|
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345')
|
||||||
#define IMGUI_VERSION "1.92.3 WIP"
|
#define IMGUI_VERSION "1.92.3 WIP"
|
||||||
#define IMGUI_VERSION_NUM 19224
|
#define IMGUI_VERSION_NUM 19225
|
||||||
#define IMGUI_HAS_TABLE // Added BeginTable() - from IMGUI_VERSION_NUM >= 18000
|
#define IMGUI_HAS_TABLE // Added BeginTable() - from IMGUI_VERSION_NUM >= 18000
|
||||||
#define IMGUI_HAS_TEXTURES // Added ImGuiBackendFlags_RendererHasTextures - from IMGUI_VERSION_NUM >= 19198
|
#define IMGUI_HAS_TEXTURES // Added ImGuiBackendFlags_RendererHasTextures - from IMGUI_VERSION_NUM >= 19198
|
||||||
|
|
||||||
|
@@ -5058,14 +5058,14 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
|
|||||||
if (flags & ImGuiInputTextFlags_EscapeClearsAll)
|
if (flags & ImGuiInputTextFlags_EscapeClearsAll)
|
||||||
{
|
{
|
||||||
// Clear input
|
// Clear input
|
||||||
IM_ASSERT(buf[0] != 0);
|
IM_ASSERT(buf[0] != 0); // FIXME: use TextA here?
|
||||||
apply_new_text = "";
|
apply_new_text = "";
|
||||||
apply_new_text_length = 0;
|
apply_new_text_length = 0;
|
||||||
value_changed = true;
|
value_changed = true;
|
||||||
IMSTB_TEXTEDIT_CHARTYPE empty_string;
|
IMSTB_TEXTEDIT_CHARTYPE empty_string;
|
||||||
stb_textedit_replace(state, state->Stb, &empty_string, 0);
|
stb_textedit_replace(state, state->Stb, &empty_string, 0);
|
||||||
}
|
}
|
||||||
else if (strcmp(buf, state->TextToRevertTo.Data) != 0)
|
else if (strcmp(state->TextA.Data, state->TextToRevertTo.Data) != 0)
|
||||||
{
|
{
|
||||||
apply_new_text = state->TextToRevertTo.Data;
|
apply_new_text = state->TextToRevertTo.Data;
|
||||||
apply_new_text_length = state->TextToRevertTo.Size - 1;
|
apply_new_text_length = state->TextToRevertTo.Size - 1;
|
||||||
|
Reference in New Issue
Block a user