Skip to content

Commit 0a73c6e

Browse files
committed
Misc tweaks, comments.
1 parent 0ebf49b commit 0a73c6e

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

docs/CHANGELOG.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ Other changes:
6262
- Debug Tools: Debug Log: Added "Configure Outputs.." button. (#5855)
6363
- Backends: SDL3: Update for API changes: SDLK_x renames and SDLK_KP_x removals (#7761, #7762)
6464
- Backends: SDL2,SDL3,OSX: Update for io.SetPlatformImeDataFn() -> io.PlatformSetImeDataFn() rename.
65-
- Backends: GLFW,SDL2: Added ioPlatformOpenInShellFn handler for web/Emscripten versions. (#7660)
65+
- Backends: GLFW,SDL2: Added io.PlatformOpenInShellFn handler for web/Emscripten versions. (#7660)
66+
[@ypujante, @ocornut]
6667

6768

6869
-----------------------------------------------------------------------

imgui.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -2054,6 +2054,10 @@ void ImFormatStringToTempBuffer(const char** out_buf, const char** out_buf_end,
20542054
va_end(args);
20552055
}
20562056

2057+
// FIXME: Should rework API toward allowing multiple in-flight temp buffers (easier and safer for caller)
2058+
// by making the caller acquire a temp buffer token, with either explicit or destructor release, e.g.
2059+
// ImGuiTempBufferToken token;
2060+
// ImFormatStringToTempBuffer(token, ...);
20572061
void ImFormatStringToTempBufferV(const char** out_buf, const char** out_buf_end, const char* fmt, va_list args)
20582062
{
20592063
ImGuiContext& g = *GImGui;

imgui_demo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7755,7 +7755,7 @@ static void ShowPlaceholderObject(const char* prefix, int uid)
77557755
ImGui::TableNextRow();
77567756
ImGui::TableSetColumnIndex(0);
77577757
ImGui::AlignTextToFramePadding();
7758-
bool node_open = ImGui::TreeNode("Object", "%s_%u", prefix, uid);
7758+
bool node_open = ImGui::TreeNode("##Object", "%s_%u", prefix, uid);
77597759
ImGui::TableSetColumnIndex(1);
77607760
ImGui::Text("my sailor is rich");
77617761

imgui_internal.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -965,8 +965,8 @@ enum ImGuiSelectableFlagsPrivate_
965965
// Extend ImGuiTreeNodeFlags_
966966
enum ImGuiTreeNodeFlagsPrivate_
967967
{
968-
ImGuiTreeNodeFlags_ClipLabelForTrailingButton = 1 << 20,
969-
ImGuiTreeNodeFlags_UpsideDownArrow = 1 << 21,// (FIXME-WIP) Turn Down arrow into an Up arrow, but reversed trees (#6517)
968+
ImGuiTreeNodeFlags_ClipLabelForTrailingButton = 1 << 28,// FIXME-WIP: Hard-coded for CollapsingHeader()
969+
ImGuiTreeNodeFlags_UpsideDownArrow = 1 << 29,// FIXME-WIP: Turn Down arrow into an Up arrow, but reversed trees (#6517)
970970
};
971971

972972
enum ImGuiSeparatorFlags_

0 commit comments

Comments
 (0)