Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_vulkan.h
#	imgui.cpp

ImDrawList: Large text passed to AddText() are being scanned for their end in order to avoid pre-reserving too many vertices.

Internals: InputText: Renaming. Comments.

InputText: Added support for buffer size/capacity changes via the ImGuiInputTextFlags_CallbackResize flag. (#2006, #1443, #1008).

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp

Nav: NavWindowingList doesn't save to .ini file. TODO entries.

TODO + added missing _None enum for some internals flags.

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	imgui_demo.cpp

Demo: Fixed spacing from b629f90 change.

Merge branch 'master' into viewport ...

# Conflicts:
#	imgui.cpp

Examples: Comments, Demo: Log early out, TODO. (#1553)

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	examples/imgui_impl_vulkan.h
#	examples/imgui_impl_win32.cpp

Comments, changelog

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	imgui.cpp

Changelog formatting update, Todo, comments. Tweak Child demo. Shuffle some code in NavUpdate().

Nav: When entering into a NavFlattened child we only consider the visible items for scoring (note that this only work assuming the NavFlattened child window has interactive items). Fixes accidentally hoping into a NavFlattened child. (#767)

Nav: NavFlattened: Fixed navigation miscrolling parent window when the current window is scrolling enough to keep the item in view. Fix feature added in e11610d6, typically affect large navigation steps (used by PageUp/PageDown). + comments (#787)

Internals: Added BeginDragDropTooltip() internal function to convey semantic (drag and drop tooltip doesn't get clipped within display boundaries). Revert part of 3218666. (#1739, #143).

Added ImGuiDragDropFlags_AcceptNoPreviewTooltip flag to disable drag source tooltip from the target site (#143)

Internals: Selectable: Renamed variables. Todo update.

Missing examples changelog bits and todo list

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
#	examples/vulkan_example/imgui_impl_glfw_vulkan.cpp

Added float GetWindowDpiScale(). (#1542, #1676)

ImVector: added erase(it first, it last) helper. Added erase_unsorted(it) helper. + todo fixes/additions

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	imgui.cpp
#	imgui.h

Comments + Internals: Selectable: decoupled internal flags and removed their menu / menu-item semantic as upcoming changes are requiring more flexibility.

Merge branch 'master' into viewport ...

# Conflicts:
#	imgui.cpp

Version 1.61 + todo additions

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	imgui.cpp
#	imgui.h

Merge branch 'data_types' ...

# Conflicts:
#	CHANGELOG.txt
#	imgui.cpp