Demo: Added an extra test related to baseline and fixed an id collision.

This commit is contained in:
omar 2017-09-28 20:15:32 +02:00
parent 164f22d5b7
commit 3b85a8b6a0

View File

@ -808,7 +808,7 @@ void ImGui::ShowTestWindow(bool* p_open)
} }
ImGui::Text("Color button only:"); ImGui::Text("Color button only:");
ImGui::ColorButton("MyColor##3b", *(ImVec4*)&color, misc_flags, ImVec2(80,80)); ImGui::ColorButton("MyColor##3c", *(ImVec4*)&color, misc_flags, ImVec2(80,80));
ImGui::Text("Color picker:"); ImGui::Text("Color picker:");
static bool alpha = true; static bool alpha = true;
@ -1183,7 +1183,8 @@ void ImGui::ShowTestWindow(bool* p_open)
ImGui::Text("Text aligned to Widget"); ImGui::SameLine(); ImGui::Text("Text aligned to Widget"); ImGui::SameLine();
ImGui::Button("Widget##1"); ImGui::SameLine(); ImGui::Button("Widget##1"); ImGui::SameLine();
ImGui::Text("Widget"); ImGui::SameLine(); ImGui::Text("Widget"); ImGui::SameLine();
ImGui::SmallButton("Widget##2"); ImGui::SmallButton("Widget##2"); ImGui::SameLine();
ImGui::Button("Widget##3");
// Tree // Tree
const float spacing = ImGui::GetStyle().ItemInnerSpacing.x; const float spacing = ImGui::GetStyle().ItemInnerSpacing.x;