Demo: Removed one level of indentation in the ShowDemoWindowXXX functions (6 kb worth of spaces!). Will break some merge/PR.

imgui_demo.cpp

@@ -391,8 +391,9 @@ void ImGui::ShowDemoWindow(bool* p_open)
 
 static void ShowDemoWindowWidgets()
 {
-    if (ImGui::CollapsingHeader("Widgets"))
-    {
+    if (!ImGui::CollapsingHeader("Widgets"))
+        return;
+
     if (ImGui::TreeNode("Basic"))
     {
         static int clicked = 0;
@@ -1513,12 +1514,12 @@ static void ShowDemoWindowWidgets()
         ImGui::TreePop();
     }
 }
-}
 
 static void ShowDemoWindowLayout()
 {
-    if (ImGui::CollapsingHeader("Layout"))
-    {
+    if (!ImGui::CollapsingHeader("Layout"))
+        return;
+
     if (ImGui::TreeNode("Child regions"))
     {
         static bool disable_mouse_wheel = false;
@@ -1903,12 +1904,12 @@ static void ShowDemoWindowLayout()
         ImGui::TreePop();
     }
 }
-}
 
 static void ShowDemoWindowPopups()
 {
-    if (ImGui::CollapsingHeader("Popups & Modal windows"))
-    {
+    if (!ImGui::CollapsingHeader("Popups & Modal windows"))
+        return;
+
     // Popups are windows with a few special properties:
     // - They block normal mouse hovering detection outside them. (*)
     // - Unless modal, they can be closed by clicking anywhere outside them, or by pressing ESCAPE.
@@ -2110,12 +2111,12 @@ static void ShowDemoWindowPopups()
         ImGui::TreePop();
     }
 }
-}
 
 static void ShowDemoWindowColumns()
 {
-    if (ImGui::CollapsingHeader("Columns"))
-    {
+    if (!ImGui::CollapsingHeader("Columns"))
+        return;
+
     ImGui::PushID("Columns");
 
     // Basic columns
@@ -2293,7 +2294,6 @@ static void ShowDemoWindowColumns()
     }
     ImGui::PopID();
 }
-}
 
 static void ShowDemoWindowMisc()
 {