From 2e275d1c6527824fd9d2ffa9b5bc0b444e470ebf Mon Sep 17 00:00:00 2001 From: ocornut Date: Mon, 22 Aug 2022 11:06:33 +0200 Subject: [PATCH] ImStrv: Fixed various compile errors/warnings. --- imgui.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index b0ae0b6a3..0127c664a 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -12047,7 +12047,7 @@ void ImGui::OpenPopup(ImStrv str_id, ImGuiPopupFlags popup_flags) { ImGuiContext& g = *GImGui; ImGuiID id = g.CurrentWindow->GetID(str_id); - IMGUI_DEBUG_LOG_POPUP("[popup] OpenPopup(\"%.*s\" -> 0x%08X\n", (int)(str_id.End - str_id.Begin), str_id, id); + IMGUI_DEBUG_LOG_POPUP("[popup] OpenPopup(\"%.*s\" -> 0x%08X\n", (int)(str_id.End - str_id.Begin), str_id.Begin, id); OpenPopupEx(id, popup_flags); } @@ -15928,7 +15928,7 @@ void ImGui::DebugRenderKeyboardPreview(ImDrawList* draw_list) // Helper tool to diagnose between text encoding issues and font loading issues. Pass your UTF-8 string and verify that there are correct. void ImGui::DebugTextEncoding(ImStrv str) { - Text("Text: \"%s\"", str); + Text("Text: \"%.*s\"", (int)str.length(), str.Begin); if (!BeginTable("##DebugTextEncoding", 4, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Resizable)) return; TableSetupColumn("Offset"); @@ -15941,7 +15941,7 @@ void ImGui::DebugTextEncoding(ImStrv str) unsigned int c; const int c_utf8_len = ImTextCharFromUtf8(&c, p, str.End); TableNextColumn(); - Text("%d", (int)(size_t)(p - str)); + Text("%d", (int)(p - str.Begin)); TableNextColumn(); for (int byte_index = 0; byte_index < c_utf8_len; byte_index++) { @@ -15950,7 +15950,7 @@ void ImGui::DebugTextEncoding(ImStrv str) Text("0x%02X", (int)(unsigned char)p[byte_index]); } TableNextColumn(); - TextUnformatted(p, p + c_utf8_len); + TextUnformatted(ImStrv(p, p + c_utf8_len)); if (!GetFont()->IsGlyphInFont((ImWchar)c)) { SameLine();