organicmaps/imgui
13
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-04-14 17:13:46 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ImStrv: Fixed various compile errors/warnings.

Browse source
This commit is contained in:
ocornut 2022-08-22 11:06:33 +02:00 • committed by ocornut
parent c5f4eaace0
commit 2fd6b70ab0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
imgui.cpp
View file

@ -11577,7 +11577,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);
}
@ -15430,7 +15430,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");
@ -15443,7 +15443,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++)
{
@ -15453,7 +15453,7 @@ void ImGui::DebugTextEncoding(ImStrv str)
}
TableNextColumn();
if (GetFont()->FindGlyphNoFallback((ImWchar)c))
TextUnformatted(p, p + c_utf8_len);
TextUnformatted(ImStrv(p, p + c_utf8_len));
else
TextUnformatted((c == IM_UNICODE_CODEPOINT_INVALID) ? "[invalid]" : "[missing]");
TableNextColumn();