From 444792f75f0a8a9d77e4bfd55b90c5fd79b652e5 Mon Sep 17 00:00:00 2001 From: omar Date: Tue, 22 Aug 2017 18:27:23 +0800 Subject: [PATCH] Merge fixes from ,master branch --- imgui_demo.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/imgui_demo.cpp b/imgui_demo.cpp index ef65a2f5..b8e61278 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -1000,8 +1000,7 @@ void ImGui::ShowTestWindow(bool* p_open) ImGui::NextColumn(); char buf[32]; sprintf(buf, "%08x", i*5731); - if (ImGui::Button(buf, ImVec2(-1.0f, 0.0f))) - printf("Pressed '%s'\n", buf); + ImGui::Button(buf, ImVec2(-1.0f, 0.0f)); } ImGui::EndChild(); ImGui::PopStyleVar(); @@ -1469,7 +1468,7 @@ void ImGui::ShowTestWindow(bool* p_open) ImGui::OpenPopup("Stacked 2"); if (ImGui::BeginPopupModal("Stacked 2")) { - ImGui::Text("Hello from Stacked The Second!\nWe are piling a modal over another here,\nand also testing if the menu-bar works."); + ImGui::Text("Hello from Stacked The Second!"); if (ImGui::Button("Close")) ImGui::CloseCurrentPopup(); ImGui::EndPopup();