From 53ebd6a02f92390e402edbc1ebaf445432066e08 Mon Sep 17 00:00:00 2001 From: omar Date: Thu, 7 May 2020 23:51:47 +0200 Subject: [PATCH 1/2] Metrics: Added Table settings block. --- imgui.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/imgui.cpp b/imgui.cpp index 6fb27a5bf..14be81f64 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -10487,6 +10487,14 @@ void ImGui::ShowMetricsWindow(bool* p_open) Funcs::NodeWindowSettings(settings); ImGui::TreePop(); } +#ifdef IMGUI_HAS_TABLE + if (ImGui::TreeNode("SettingsTables", "Settings packed data: Tables: %d bytes", g.SettingsTables.size())) + { + for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings)) + Funcs::NodeTableSettings(settings); + ImGui::TreePop(); + } +#endif if (ImGui::TreeNode("SettingsIniData", "Settings unpacked data (.ini): %d bytes", g.SettingsIniData.size())) { char* buf = (char*)(void*)(g.SettingsIniData.Buf.Data ? g.SettingsIniData.Buf.Data : ""); From c0d5b3f55a977fb3909bd80d90018a47fa5b0191 Mon Sep 17 00:00:00 2001 From: omar Date: Thu, 7 May 2020 23:58:35 +0200 Subject: [PATCH 2/2] Fix to facilitate branch merges --- imgui.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/imgui.cpp b/imgui.cpp index 14be81f64..97950b638 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -10487,6 +10487,7 @@ void ImGui::ShowMetricsWindow(bool* p_open) Funcs::NodeWindowSettings(settings); ImGui::TreePop(); } + #ifdef IMGUI_HAS_TABLE if (ImGui::TreeNode("SettingsTables", "Settings packed data: Tables: %d bytes", g.SettingsTables.size())) { @@ -10495,6 +10496,10 @@ void ImGui::ShowMetricsWindow(bool* p_open) ImGui::TreePop(); } #endif + +#ifdef IMGUI_HAS_DOCK +#endif + if (ImGui::TreeNode("SettingsIniData", "Settings unpacked data (.ini): %d bytes", g.SettingsIniData.size())) { char* buf = (char*)(void*)(g.SettingsIniData.Buf.Data ? g.SettingsIniData.Buf.Data : "");