Merge branch 'master' into navigation

# Conflicts:
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar
2017-12-29 13:39:07 +01:00
6 changed files with 34 additions and 22 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.53
// dear imgui, v1.54 WIP
// (demo code)
// Message to the person tempted to delete this file when integrating ImGui into their code base:
@ -2403,6 +2403,7 @@ static void ShowExampleAppFixedOverlay(bool* p_open)
if (ImGui::MenuItem("Top-right", NULL, corner == 1)) corner = 1;
if (ImGui::MenuItem("Bottom-left", NULL, corner == 2)) corner = 2;
if (ImGui::MenuItem("Bottom-right", NULL, corner == 3)) corner = 3;
if (p_open && ImGui::MenuItem("Close")) *p_open = false;
ImGui::EndPopup();
}
ImGui::End();