From 29b5174ebf0b644d374193d8a95060c124995ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 28 May 2016 19:26:58 -0700 Subject: [PATCH] Cleanup. --- 3rdparty/ocornut-imgui/widgets/memory_editor.inl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/3rdparty/ocornut-imgui/widgets/memory_editor.inl b/3rdparty/ocornut-imgui/widgets/memory_editor.inl index 0c084f64f..87985705d 100644 --- a/3rdparty/ocornut-imgui/widgets/memory_editor.inl +++ b/3rdparty/ocornut-imgui/widgets/memory_editor.inl @@ -69,7 +69,7 @@ namespace ImGui for (int line_i = clipper.DisplayStart; line_i < clipper.DisplayEnd; line_i++) // display only visible items { int addr = line_i * Rows; - Text("%0*X: ", addr_digits_count, base_display_addr+addr); + Text("%0*zx: ", addr_digits_count, base_display_addr+addr); SameLine(); // Draw Hexadecimal @@ -100,8 +100,8 @@ namespace ImGui if (DataEditingTakeFocus) { SetKeyboardFocusHere(); - sprintf(AddrInput, "%0*X", addr_digits_count, base_display_addr+addr); - sprintf(DataInput, "%02X", mem_data[addr]); + sprintf(AddrInput, "%0*zx", addr_digits_count, base_display_addr+addr); + sprintf(DataInput, "%02x", mem_data[addr]); } PushItemWidth(CalcTextSize("FF").x); @@ -151,12 +151,12 @@ namespace ImGui } else { - Text("%02X ", byte); + Text("%02x ", byte); } } else { - Text("%02X ", mem_data[addr]); + Text("%02x ", mem_data[addr]); } if (AllowEdits && IsItemHovered() && IsMouseClicked(0)) @@ -212,7 +212,7 @@ namespace ImGui PopAllowKeyboardFocus(); PopItemWidth(); SameLine(); - Text("Range %0*X..%0*X", addr_digits_count, (int)base_display_addr, addr_digits_count, (int)base_display_addr+mem_size-1); + Text("Range %0*x..%0*x", addr_digits_count, (int)base_display_addr, addr_digits_count, (int)base_display_addr+mem_size-1); SameLine(); PushItemWidth(70); if (InputText("##addr", AddrInput, 32, ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_EnterReturnsTrue))