From 558430ca8f9fb8b4796f07eaa24b8a13f3a97baf Mon Sep 17 00:00:00 2001
From: ocornut <omarcornut@gmail.com>
Date: Sun, 13 Dec 2015 22:07:01 +0000
Subject: [PATCH] TreeNode() fixed alignment of collapse arrow to it matches
 bullet (broken in 4006fb77bc9a6b99dfa50d6cf35458f3bd06e027)

---
 imgui.cpp      | 2 +-
 imgui_demo.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/imgui.cpp b/imgui.cpp
index 456f1daad..b009b54ce 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -5593,7 +5593,7 @@ bool ImGui::CollapsingHeader(const char* label, const char* str_id, bool display
         bb.Max.x += (float)(int)(window->WindowPadding.x*0.5f) - 1;
     }
 
-    const float collapser_width = g.FontSize + padding.x*2;
+    const float collapser_width = g.FontSize + (display_frame ? padding.x*2 : padding.x);
     const float text_width = collapser_width + (label_size.x > 0.0f ? label_size.x + padding.x*2 : 0.0f);   // Include collapser
     ItemSize(ImVec2(text_width, frame_height), text_base_offset_y);
 
diff --git a/imgui_demo.cpp b/imgui_demo.cpp
index a28a18d46..3e03c7682 100644
--- a/imgui_demo.cpp
+++ b/imgui_demo.cpp
@@ -223,7 +223,8 @@ void ImGui::ShowTestWindow(bool* p_opened)
 
         if (ImGui::TreeNode("Fonts", "Fonts (%d)", ImGui::GetIO().Fonts->Fonts.Size))
         {
-            ImGui::TextWrapped("Tip: Load fonts with io.Fonts->AddFontFromFileTTF().");
+            ImGui::SameLine();
+            ShowHelpMarker("Tip: Load fonts with io.Fonts->AddFontFromFileTTF()\nbefore calling io.Fonts->GetTex* functions.");
             ImFontAtlas* atlas = ImGui::GetIO().Fonts;
             if (ImGui::TreeNode("Atlas texture", "Atlas texture (%dx%d pixels)", atlas->TexWidth, atlas->TexHeight))
             {