From c0d18bddb0e896b720e1f5b9919ff0a1fa3749ee Mon Sep 17 00:00:00 2001 From: ocornut Date: Thu, 6 Mar 2025 19:25:57 +0100 Subject: [PATCH] ImStrv: fix in ShowIDStackToolWindow(), Font section. Font loading. --- imgui.cpp | 4 ++-- imgui_draw.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index ddd3b8b7a..5cff48ff6 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -16142,7 +16142,7 @@ void ImGui::ShowFontAtlas(ImFontAtlas* atlas) ImFontAtlasRect r = {}; atlas->GetCustomRect(id, &r); ImStrv buf; - ImFormatStringToTempBuffer(&buf, NULL, "ID:%08X, used:%d, { w:%3d, h:%3d } { x:%4d, y:%4d }", id, entry.IsUsed, r.w, r.h, r.x, r.y); + ImFormatStringToTempBuffer(&buf, "ID:%08X, used:%d, { w:%3d, h:%3d } { x:%4d, y:%4d }", id, entry.IsUsed, r.w, r.h, r.x, r.y); TableNextColumn(); Selectable(buf.Begin); if (IsItemHovered()) @@ -17827,7 +17827,7 @@ void ImGui::ShowIDStackToolWindow(bool* p_open) if (c == '/') tool->ResultTempBuf.append("\\"); if (c < 256 || !tool->OptHexEncodeNonAsciiChars) - tool->ResultTempBuf.append(p, p_next); + tool->ResultTempBuf.append(ImStrv(p, p_next)); else for (; p < p_next; p++) tool->ResultTempBuf.appendf("\\x%02x", (unsigned char)*p); p = p_next; diff --git a/imgui_draw.cpp b/imgui_draw.cpp index 064d0aba3..a1500edd6 100644 --- a/imgui_draw.cpp +++ b/imgui_draw.cpp @@ -3135,7 +3135,7 @@ ImFont* ImFontAtlas::AddFontFromFileTTF(ImStrv filename, float size_pixels, cons { if (font_cfg_template == NULL || (font_cfg_template->Flags & ImFontFlags_NoLoadError) == 0) { - IMGUI_DEBUG_LOG("While loading '%s'\n", filename); + IMGUI_DEBUG_LOG("While loading '%.*s'\n", filename.length(), filename.Begin); IM_ASSERT_USER_ERROR(0, "Could not load font file!"); } return NULL;