Columns: Added Property Tree demo among tidying up demos (#125, #414)

imgui_demo.cpp

@@ -1200,7 +1200,8 @@ void ImGui::ShowTestWindow(bool* opened)
     if (ImGui::CollapsingHeader("Columns"))
     {
         // Basic columns
-        ImGui::Text("Basic:");
+        if (ImGui::TreeNode("Basic"))
+        {
             ImGui::Columns(4, "mycolumns");
             ImGui::Separator();
             ImGui::Text("ID"); ImGui::NextColumn();
@@ -1223,13 +1224,14 @@ void ImGui::ShowTestWindow(bool* opened)
                 ImGui::Text("...."); ImGui::NextColumn();
             }
             ImGui::Columns(1);
-
             ImGui::Separator();
-        ImGui::Spacing();
+            ImGui::TreePop();
+        }
 
         // Scrolling columns
         /*
-        ImGui::Text("Scrolling:");
+        if (ImGui::TreeNode("Scrolling"))
+        {
             ImGui::BeginChild("##header", ImVec2(0, ImGui::GetTextLineHeightWithSpacing()+ImGui::GetStyle().ItemSpacing.y));
             ImGui::Columns(3);
             ImGui::Text("ID"); ImGui::NextColumn();
@@ -1248,25 +1250,22 @@ void ImGui::ShowTestWindow(bool* opened)
             }
             ImGui::Columns(1);
             ImGui::EndChild();
-
+            ImGui::TreePop();
-        ImGui::Separator();
+        }
-        ImGui::Spacing();
         */
 
         // Create multiple items in a same cell before switching to next column
-        ImGui::Text("Mixed items:");
+        if (ImGui::TreeNode("Mixed items"))
+        {
             ImGui::Columns(3, "mixed");
             ImGui::Separator();
 
-        static int e = 0;
             ImGui::Text("Hello");
             ImGui::Button("Banana");
-        ImGui::RadioButton("radio a", &e, 0);
             ImGui::NextColumn();
 
             ImGui::Text("ImGui");
             ImGui::Button("Apple");
-        ImGui::RadioButton("radio b", &e, 1);
             static float foo = 1.0f;
             ImGui::InputFloat("red", &foo, 0.05f, 0, 3);
             ImGui::Text("An extra line here.");
@@ -1274,7 +1273,6 @@ void ImGui::ShowTestWindow(bool* opened)
 
             ImGui::Text("Sailor");
             ImGui::Button("Corniflower");
-        ImGui::RadioButton("radio c", &e, 2);
             static float bar = 1.0f;
             ImGui::InputFloat("blue", &bar, 0.05f, 0, 3);
             ImGui::NextColumn();
@@ -1283,60 +1281,104 @@ void ImGui::ShowTestWindow(bool* opened)
             if (ImGui::CollapsingHeader("Category B")) ImGui::Text("Blah blah blah"); ImGui::NextColumn();
             if (ImGui::CollapsingHeader("Category C")) ImGui::Text("Blah blah blah"); ImGui::NextColumn();
             ImGui::Columns(1);
-
             ImGui::Separator();
-        ImGui::Spacing();
+            ImGui::TreePop();
+        }
 
-        // Tree items
+        // Word wrapping
-        ImGui::Text("Tree items:"); 
+        if (ImGui::TreeNode("Word-wrapping"))
-        ImGui::SameLine(); ShowHelpMarker("Whole tree inside single cell");
+        {
+            ImGui::Columns(2, "word-wrapping");
+            ImGui::Separator();
+            ImGui::TextWrapped("The quick brown fox jumps over the lazy dog.");
+            ImGui::TextWrapped("Hello Left");
+            ImGui::NextColumn();
+            ImGui::TextWrapped("The quick brown fox jumps over the lazy dog.");
+            ImGui::TextWrapped("Hello Right");
+            ImGui::Columns(1);
+            ImGui::Separator();
+            ImGui::TreePop();
+        }
+
+        if (ImGui::TreeNode("Borders"))
+        {
+            static bool h_borders = true;
+            static bool v_borders = true;
+            ImGui::Checkbox("horizontal", &h_borders);
+            ImGui::SameLine();
+            ImGui::Checkbox("vertical", &v_borders);
+            ImGui::Columns(4, NULL, v_borders);
+            if (h_borders) ImGui::Separator();
+            for (int i = 0; i < 8; i++)
+            {
+                ImGui::Text("%c%c%c", 'a'+i, 'a'+i, 'a'+i);
+                ImGui::NextColumn();
+            }
+            ImGui::Columns(1);
+            if (h_borders) ImGui::Separator();
+            ImGui::TreePop();
+        }
+
+        if (ImGui::TreeNode("Property tree"))
+        {
+            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2,2));
+            ImGui::Columns(2);
+            ImGui::Separator();
+
+            ImGui::Text("Item1"); ImGui::NextColumn();
+            ImGui::Text("value1"); ImGui::NextColumn();
+
+            // Iterate dummy objects with dummy members (all the same data)
+            static float members[6] = { 0.0f,1.0f,3.1416f,100.0f,999.0f };
+            for (int obj_i = 0; obj_i < 3; obj_i++)
+            {
+                ImGui::PushID(obj_i);
+                bool opened = ImGui::TreeNode("Object", "Object%d", obj_i);
+                ImGui::NextColumn();
+                ImGui::Text("my tailor is rich");
+                ImGui::NextColumn();
+                if (opened) 
+                {
+                    for (int i = 0; i < 6; i++)
+                    {
+                        ImGui::PushID(i);
+                        ImGui::AlignFirstTextHeightToWidgets();
+                        // Here we use a Selectable (instead of Text) to highlight on hover
+                        //ImGui::Text("Field%d", i);
+                        char label[32];
+                        sprintf(label, "Field%d", i);
+                        ImGui::Selectable(label);
+                        ImGui::NextColumn();
+                        ImGui::PushItemWidth(-1);
+                        if (i >= 3)
+                            ImGui::InputFloat("##value", &members[i], 1.0f);
+                        else
+                            ImGui::DragFloat("##value", &members[i], 0.01f);
+                        ImGui::PopItemWidth();
+                        ImGui::NextColumn();
+                        ImGui::PopID();
+                    }
+                    ImGui::TreePop();
+                }
+                ImGui::PopID();
+            }
+
+            ImGui::Columns(1);
+            ImGui::Separator();
+            ImGui::PopStyleVar();
+            ImGui::TreePop();
+        }
+
+        bool opened = ImGui::TreeNode("Tree within single cell");
+        ImGui::SameLine(); ShowHelpMarker("NB: Tree node must be poped before ending the cell.\nThere's no storage of state per-cell.");
+        if (opened)
+        {
             ImGui::Columns(2, "tree items"); 
             ImGui::Separator();
             if (ImGui::TreeNode("Hello")) { ImGui::BulletText("Sailor"); ImGui::TreePop(); } ImGui::NextColumn();
             if (ImGui::TreeNode("Bonjour")) { ImGui::BulletText("Marin"); ImGui::TreePop(); } ImGui::NextColumn();
             ImGui::Columns(1);
-
             ImGui::Separator();
-        ImGui::Spacing();
-
-        // Word wrapping
-        ImGui::Text("Word-wrapping:");
-        ImGui::Columns(2, "word-wrapping");
-        ImGui::Separator();
-        ImGui::TextWrapped("The quick brown fox jumps over the lazy dog.");
-        ImGui::Text("Hello Left");
-        ImGui::NextColumn();
-        ImGui::TextWrapped("The quick brown fox jumps over the lazy dog.");
-        ImGui::Text("Hello Right");
-        ImGui::Columns(1);
-
-        ImGui::Separator();
-        ImGui::Spacing();
-
-        if (ImGui::TreeNode("Inside a tree.."))
-        {
-            if (ImGui::TreeNode("node 1 (with borders)"))
-            {
-                ImGui::Columns(4);
-                for (int i = 0; i < 8; i++)
-                {
-                    ImGui::Text("%c%c%c", 'a'+i, 'a'+i, 'a'+i);
-                    ImGui::NextColumn();
-                }
-                ImGui::Columns(1);
-                ImGui::TreePop();
-            }
-            if (ImGui::TreeNode("node 2 (without borders)"))
-            {
-                ImGui::Columns(4, NULL, false);
-                for (int i = 0; i < 8; i++)
-                {
-                    ImGui::Text("%c%c%c", 'a'+i, 'a'+i, 'a'+i);
-                    ImGui::NextColumn();
-                }
-                ImGui::Columns(1);
-                ImGui::TreePop();
-            }
             ImGui::TreePop();
         }
     }