Added IsItemActivated() as an extension to the IsItemDeactivated/IsItemDeactivatedAfterEdit functions which are useful to implement variety of undo patterns. (#820, #956, #1875)

Merge branch 'master' into docking ...

# Conflicts:
#	imgui_internal.h
#	imgui_widgets.cpp

Tabs: Non-docking tab bars are storing names to allow tab list button + whole style scaling. Added ImGuiTabBarFlags_TabListPopupButton flag to show a popup button on manual tab bars. Locking FramePadding for the scope of a tab-bar to avoid sheering/clipping of tab item. Made scaling of tab ellipsis less awkward. (#261, #351)

ImGuiTextBuffer: Fix size() to allow using ImGuiTextBuffer with resize(0) patterns.

Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h

Merged from Docking branch: Various small changes, comments, typos fixes, moved blocks. To reduce overall drift. Should be no-op.

Merged from Docking branch: non-const ImVec2[] operator.

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp

Fixed doc typo (#2326)

Viewport: Added ImGuiViewportFlags_NoFocusOnClick + support in imgui_impl_win32. Made windows with no decoration always set the _NoFocus flags. (#1542, #2117) ...

Fix e.g. clicking on protruding combo box stealing highlight from parent window with decoration.

Added ImGuiDockNodeFlags_AutoHideTabBar. (#2109)

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp

Revert "Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages)." ...

This reverts commit 20bc06a.

Using IM_UNUSED() macro.

Fix various XCode and PVS-Studio static analyzer warnings (#2309)

Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages).

Merge branch 'viewport' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/README.txt
#	imgui.cpp

Internals: Tweaks. Comments about PushID/GetID public function.

ImGuiTextBuffer: Added append() function (unformatted).

Merge branch 'viewport' into docking ...

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

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_vulkan.h
#	imgui.cpp

Removed trailing spaces (#2038, #2299)

Added checks for "zero-as-null-pointer-constant" warnings for older Clang (#2299, followup to #2277)

Merge branch 'viewport' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt

Merge branch 'master' into viewport ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_win32.cpp
#	imgui_demo.cpp

FreeType: Minor tweaks previous commit (#2285)

Merge branch 'viewport' into docking

Merge branch 'master' into viewport ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h