Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-24 16:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes from ,master branch

Browse Source
This commit is contained in:
omar 2017-08-22 18:27:23 +08:00
parent 7de68fbe3d
commit 444792f75f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
imgui_demo.cpp
View File

@ -1000,8 +1000,7 @@ void ImGui::ShowTestWindow(bool* p_open)
ImGui::NextColumn(); ImGui::NextColumn();
char buf[32]; char buf[32];
sprintf(buf, "%08x", i*5731); sprintf(buf, "%08x", i*5731);
if (ImGui::Button(buf, ImVec2(-1.0f, 0.0f))) ImGui::Button(buf, ImVec2(-1.0f, 0.0f));
printf("Pressed '%s'\n", buf);
} }
ImGui::EndChild(); ImGui::EndChild();
ImGui::PopStyleVar(); ImGui::PopStyleVar();
@ -1469,7 +1468,7 @@ void ImGui::ShowTestWindow(bool* p_open)
ImGui::OpenPopup("Stacked 2"); ImGui::OpenPopup("Stacked 2");
if (ImGui::BeginPopupModal("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")) if (ImGui::Button("Close"))
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
ImGui::EndPopup(); ImGui::EndPopup();