1
0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-24 07:40:22 +01:00

Demo: Fixed conflicting id introduced in be9628494a . Added tooltip.

This commit is contained in:
omar 2017-08-14 13:05:03 +08:00
parent 648f75b245
commit 97fccbdb73

View File

@ -1484,6 +1484,8 @@ void ImGui::ShowTestWindow(bool* p_open)
if (ImGui::CollapsingHeader("Columns"))
{
ImGui::PushID("Columns");
// Basic columns
if (ImGui::TreeNode("Basic"))
{
@ -1631,6 +1633,7 @@ void ImGui::ShowTestWindow(bool* p_open)
ImGui::Separator();
ImGui::TreePop();
}
ImGui::PopID();
}
if (ImGui::CollapsingHeader("Filtering"))
@ -1786,7 +1789,7 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
if (ImGui::TreeNode("Rendering"))
{
ImGui::Checkbox("Anti-aliased lines", &style.AntiAliasedLines);
ImGui::Checkbox("Anti-aliased lines", &style.AntiAliasedLines); ImGui::SameLine(); ShowHelpMarker("When disabling anti-aliasing lines, you'll probably want to disable borders in your style as well.");
ImGui::Checkbox("Anti-aliased shapes", &style.AntiAliasedShapes);
ImGui::PushItemWidth(100);
ImGui::DragFloat("Curve Tessellation Tolerance", &style.CurveTessellationTol, 0.02f, 0.10f, FLT_MAX, NULL, 2.0f);