Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
#	imgui.h
#	misc/debuggers/imgui.natvis

misc/README.txt

@@ -3,6 +3,10 @@ misc/cpp/
   InputText() wrappers for C++ standard library (STL) type: std::string.
   This is also an example of how you may wrap your own similar types.
 
+misc/debuggers/
+  Helper files for popular debuggers.
+  With the .natvis file, types like ImVector<> will be displayed nicely in Visual Studio debugger.
+
 misc/fonts/
   Fonts loading/merging instructions (e.g. How to handle glyph ranges, how to merge icons fonts).
   Command line tool "binary_to_compressed_c" to create compressed arrays to embed data in source code.
@@ -12,11 +16,6 @@ misc/freetype/
   Font atlas builder/rasterizer using FreeType instead of stb_truetype.
   Benefit from better FreeType rasterization, in particular for small fonts.
 
-misc/natvis/
-  Natvis file to describe dear imgui types in the Visual Studio debugger.
-  With this, types like ImVector<> will be displayed nicely in the debugger.
-  You can include this file a Visual Studio project file, or install it in Visual Studio folder.
-
 misc/single_file/
   Single-file header stub.
   We use this to validate compiling all *.cpp files in a same compilation unit.

misc/debuggers/README.txt

@@ -0,0 +1,7 @@
+
+HELPER FILES FOR POPULAR DEBUGGERS
+
+imgui.natvis
+    Natvis file to describe dear imgui types in the Visual Studio debugger.
+    With this, types like ImVector<> will be displayed nicely in the debugger.
+    You can include this easily in your Visual Studio project files.

misc/debuggers/imgui.natvis

@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- natvis file for Visual Studio debugger (you can include this in a project file, or install in visual studio folder) -->
+<!--
+ natvis file for Visual Studio debugger
+ Provide nicer views on data types used by Dear ImGui.
+
+ To enable:
+ - include file in your VS project (recommended: not intrusive and always kept up to date)
+ - copy in %USERPROFILE%\Documents\Visual Studio XXXX\Visualizers (current user)
+ - copy in %VsInstallDirectory%\Common7\Packages\Debugger\Visualizers (all users)
+
+ More references? See https://docs.microsoft.com/en-us/visualstudio/debugger/create-custom-views-of-native-objects?view=vs-2019
+
+-->
 
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
 
@@ -13,7 +24,7 @@
     </ArrayItems>
   </Expand>
 </Type>
-  
+
 <Type Name="ImSpan&lt;*&gt;">
   <DisplayString>{{Size={DataEnd-Data} }}</DisplayString>
   <Expand>
@@ -49,5 +60,5 @@
 <Type Name="ImGuiDockNode">
   <DisplayString>{{ID {ID,x} Pos=({Pos.x,g} {Pos.y,g}) Size=({Size.x,g} {Size.y,g}) Parent {(ParentNode==0)?0:ParentNode->ID,x} Childs {(ChildNodes[0] != 0)+(ChildNodes[1] != 0)} Windows {Windows.Size}  }</DisplayString>
 </Type>
-  
-</AutoVisualizer>
+
+</AutoVisualizer>

misc/natvis/README.txt

@@ -1,4 +0,0 @@
-
-Natvis file to describe dear imgui types in the Visual Studio debugger.
-With this, types like ImVector<> will be displayed nicely in the debugger.
-You can include this file a Visual Studio project file, or install it in Visual Studio folder.