Synced/merged minor cruft from master branch to minimize drift. Only meaningful change AFAIK is removing ImGuiComboFlags_PopupAlignLeft flag from the tab list combo emitted by TabBar.

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

Comments about obsoleted features version. Todo. Clarify tab bar initial offset (useful if we decide to remove the half-windowpadding clip margin).

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx11.h
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_dx9.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_opengl3.h
#	examples/imgui_impl_osx.h
#	examples/imgui_impl_osx.mm
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h

Comments, todo entries, moved ImGuiSelectableFlagsPrivate in higher ranges to match others.

Fixed InputFloatX, SliderFloatX, DragFloatX functions erroneously reporting IsItemEdited() multiple times when the text input doesn't match the formatted output value (e.g. input "1" shows "1.000"). It wasn't much of a problem because we typically use the return value instead of IsItemEdited() here. (#1875, #2034)

Internal: Renamed fields + minor tweaks (probably shallow break stack-layout pr, sorry!)

Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp

Internal: Refactored Separator into SeparatorEx(), exposed ImGuiSeparatorFlags_SpanAllColumns in imgui_internal.h and support without. (#759) + misc comments

Version 1.70

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_vulkan.cpp
#	imgui.cpp

Drag and Drop: Fixed drag source with ImGuiDragDropFlags_SourceAllowNullID and null ID from receiving click regardless of being covered by another window (it didn't honor correct hovering rules). (#2521)

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

Popups: Closing a popup restores the focused/nav window in place at the time of the popup opening, instead of restoring the window that was in the window stack at the time of the OpenPopup call. (#2517) ...

Among other things, this allows opening a popup while no window are focused, and pressing Escape to clear the focus again.

Merge branch 'master' into docking ...

# Conflicts:
#	examples/example_sdl_opengl2/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	imgui.cpp

Internals: TempInputText: Rename InputScalarAsWidgetReplacement() -> TempInputTextScalar(), ScalarAsInputTextId -> TempInputTextId, small tidying up in affected functions.

Misc comments, internal renaming, added disable indentation option to Columns demo section.

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui.h

Clarified asserts comments + todo entries. (#2500)

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_sdl.cpp

Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. (#2494)

Merge branch 'master' into docking

Internals: Tweak ItemSize calls. Added todo items.

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl3.cpp

InputText: Made Shift+Tab consistently do nothing regardless of whether the back-end emits both char and keys or just keys. (#2467, #1336)

InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. (#1336, #2467) ...

+ Fix some output filename in SDL build batch files.

InputText: Work-around for buggy standard libraries where isprint('\t') returns true. (#2467, #1336) ...

Not using isprint. + todo items.

Docking: Fixed focus restore lagging by a frame when a tab stops being submitted. (#2109) Building on a little build of technical debt there, should transition toward a more general docking-agnostic system (#2304)

Docking: Disable SkipItems when directly/programmatically focused (possible generalization of code currently in BeginDocked which relies on tab bar interaction, will remove that code in next commit). (#2453, #2109)

Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp