Internal: InputText: Refactor to clarify access pattern to the InputTextState (we are now accessing via a pointer which can be NULL, shortened its name while we are at it) + added an assert to track an issue that existed already before.

Internal: InputText: Comments. Renamed internal member. Renamed ImGuiStb->ImStb.

InputText: Renamed some local variables to clarify code. Should be a no-op functionality wise. TODO items.

InputInt, InputFloat, InputScalar: Fix to keep the label of the +/- buttons centered when style.FramePadding.x is abnormally larger than style.FramePadding.y. Since the buttons are meant to be square (to align with e.g. color button) we always use FramePadding.y. (#2367)

Version 1.69 WIP

Internal: Changed Scrollbar() signature. Using GetScrollbarID() in InputTextMultiline(). ...

Removed multiple semi-colons (#2368)

Fixed unused argument warning when compiling with IM_ASERT() evaluating to an empty macro.

Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt

Version 1.68

Docking: Fixed bad ever-growing/ leak (accumulating text into TabsNames forever, fix d38f4dc14 from February 5th, affected docking branch only). (#2109)

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui.h

Selectable: add support for specifying text alignment on selectables (#2347) ...

Adds a style variable to Selectable that allows clients to specify the
text alignment within Selectables, adds a section in the demo to
demonstrate selectable text alignment, and a pair of sliders in the
style editor to change selectable alignment on the fly.

In terms of implementation, this one is extremely simple: Selectable was
already calling an API that supports text alignment, but had hard-coded
it to top-left. This changes that to just pass the style variable
straight through to RenderTextClipped. Backwards-compatibility is
preserved by defaulting the text_align parameter to (0, 0), i.e.,
top-left.

This also fixes a bug with selectable text rendering that caused
right-aligned text in a selectable to be clipped incorrectly, because
the wrong clipping rectangle was being used.

Scrollbar: Fade out and disable interaction when too small, in order to facilitate using the resize grab on very small window, as well as reducing visual noise/overlap. (+1 squashed commits) ...

Internals: Added GetScrollbarID(). (#1185)

Shallow tweaks

Merge branch 'master' into docking ...

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

Tabs: Fixed border (when enabled) so it is aligned correctly mid-pixel and appears as bright as other borders.

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp

ListBox/InputTextMultiline: Better optimized when clipped / non-visible.

DragScalarN, SliderScalarN, InputScalarN: Removed unnecessary string id after the integer PushID() calls.

Minor tweaks to reduce false positive of PVS Studio static analyzer.

Menus: Tweaked horizontal overlap between parent and child menu (to help convey relative depth) from using style.ItemSpacing.x to style.ItemInnerSpacing.x, the later being expected to be smaller. (#1086)

Plot: Register an ID to take the click the same way as other framed widgets. Set HoveredId in the FramePadding zone (between inner_bb and frame_bb).

Internals: Selectable: Fixed rendering width miscalculation when starting pos is not line start pos, which would generally be unnoticeable. Could affect group lock X with a smaller SetCursorPos value but that's unlikely to be used.

Internals: Removed unnecessary code.

Merge branch 'master' into docking ...

# Conflicts:
#	imgui_internal.h
#	imgui_widgets.cpp

Tabs: Moved Tab List Popup to left-side to match docking button. Highlight selected tab. (#261, #351)

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)

RadioButton: Fixed label horizontal alignment to precisely match Checkbox(). + Internals: Checkbox, RadioButton: Single call to ItemSize() for flow layout purpose.

Internals: DragScalar, SliderScalar: Calling ItemSize before ItemAdd as with every other widgets so we can more easily rearrange the signature of ItemXXX functions (toward allowing non-rounded sizes for scaling and flow layout).

Merge branch 'master' into docking (enable range_select merge) ...

# Conflicts:
#	imgui.cpp
#	imgui_internal.h