Merge branch 'master' of https://github.com/jtilander/imgui into jtilander-master ...

Conflicts:
	imgui.cpp

Comments

If mouse was first clicked outside of ImGui bounds we also cancel out hovering.

Avoid requesting IO.WantCaptureMouse if earlier click/hold was outside of ImGui window

Comments

Added ImGuiWindowFlags_NoCollapse flag

Fixed more pedantic warnings

Fixed warnings

Merged changes from original master

Version number 1.31 wip

Fixed / removed unncessary allocation in Render()

Removed the dependency on realloc functionality #117 + fixed one alloc in NewFrame()

InputText: Filtering private Unicode range 0xE000-0xF8FF seems like glfw on OSX uses those?

Enabled us to create the internal state on client side allocated memory, e.g. a heap

Fixed pointer dereferencing error from merge

Merge branch 'master' of https://github.com/ocornut/imgui

Added a way to replace the internal state pointer so that we can optionally share it between modules (e.g. multiple DLLs)

Removed the dependency on realloc functionality

Shortened text

InputText: process character input before Return because they may come together (IME batch)

Wrapping g.ActiveId assignment into a function for easy breakpoint.

Pedantic grammar fix

Version change

Embedded a mouse cursor that can be drawn for you by setting io.MouseDrawCursor

ImColor::HSV() helper + color buttons demo

Added ImColor() inline helper. Image/ImageButton() now takes ImVec4 for consistency and honor window alpha.

Exposed ColorConvertHSVtoRGB, ColorConvertRGBtoHSV, ColorConvertFloat4ToU32

Added ImageButton() using regular framing + override framing size (#73)

ImDrawList::AddCallback() allows for custom rendering (e.g. 3D scene inside a imgui widget))

ShowTestWindow() early out if window is collapsed. Drawing the 2 columns example differently.