Examples + Viewport: GLFW: context wasn't set when using multiple windows. (#2392)

ColorPicker: Fix assertion when running in a collapsed window and dragging its title bar (#2389)

Misc: Asserting in NewFrame() if style.WindowMinSize is zero or smaller than (1.0f,1.0f). Internal: ImHash functions tweaks. Added InputText() to query status section.

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui.h

InputInt, InputScalar: +/- buttons now respects the natural type limits instead of overflowing or underflowing the value.

DragScalar, InputScalar, SliderScalar: Added support for u8/s8/u16/s16 data types. We are reusing function instances for larger types to reduce code size. (#643, #320, #708, #1011)

Comments

Internal: InputText: Tweaks to make PVS static analyzer relax a little with its false positive.

Renamed ColorEdit/ColorPicker's ImGuiColorEditFlags_RGB/_HSV/_HEX flags to respectively ImGuiColorEditFlags_DisplayRGB/_DisplayHSV/_DisplayHex. This is anticipation of adding new flags to ColorEdit/ColorPicker functions which would make those ambiguous. (#2384) [@haldean]

add _Show prefix to color flags that control inputs, rename __InputsMask to __ShowMask ...

This is anticipation of changing __InputsMask to control the format of
input colors, and adding _InputRGB and _InputHSV to change how input
colors are interpreted.

Added px_render_imgui.h (#1935)

Update README.md

Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch ...

# Conflicts:
#	examples/imgui_impl_allegro5.cpp

Plot: Fixed error in 5e3a1de (#2387)

Plot: Fixed divide-by-zero in PlotLines() when passing a count of 1. (#2387) [@Lectem]

Moved Settings section above Docking to facilitate master<>docking merges.

Moved Logging/Capturing section above Docking to facilitate master<>docking merges.

Merge branch 'master' into docking

InputText: Fixed various display corruption related to swapping the underlying buffer while a input widget is active (both for writable and read-only paths). Often they would manifest when manipulating the scrollbar of a multi-line input text.

Internal: InputText: Minor changes (intended to have side-effect but clarify next commit, however there is rarely such a thing as zero side effect in InputText land!)

InputText; Disabled rendering selection when inactive (it kinda work but I'm not sure this is desirable especially for single-line input, was not intended to be active).

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp

Fixes warning caused by a missing switch/case. (#2382, #2381)

Fix -Wconversion warning (#2379) ...

The warning was caused by implicit conversion from pointer type which
NULL has to non-pointer type, e.g. if ImTextureID is long int

InputText: Fixed deactivated but-last-active InputText instance holding on displaying the last active version of the text and not reflecting change in the source. Fix/amend 2e9a175. [+test]

Fixed uninitialized variable (leading to asserts in the docking branch). (#2376, #2371)

Log/Capture: Fixed extraneous leading carriage return. Fixed an issue when empty string on a new line would not emit a carriage return.

Log/Capture: Fixed LogXXX functions 'auto_open_depth' parameter being treated as an absolute tree depth instead of a relative one. Fixed CollapsingHeader trailing ascii representation being "#" instead of "##". Minor tidying up the of code.

Internal: Log/Capture: Rework to add an internal LogToBuffer() function which is useful for writing automated tests. Clarified logging state by adding an enum.

Nav: Fixed a tap on AltGR (e.g. German keyboard) from navigation to the menu layer. (follow and extend on e.g #369, #370)