Merge remote-tracking branch 'origin' into 2015-05-menus ...

Conflicts:
	imgui.cpp

Added Dummy() helper

WIP Menus: Added Enabled/Disabled option for MenuItem() (#126)

WIP Menus: Added BeginMainMenuBar()/EndMainMenuBar() helpers. Added to examples.

WIP Menus: don't clamp windows within display when a position has been explicitly set by user. Menu item spacing uses ItemSpacing. (#126)

WIP Menus: menus now affected by WindowMinSize (#126)

Merge remote-tracking branch 'origin' into 2015-05-menus ...

Conflicts:
	imgui.cpp

Removed unnecessary PushTextureId/PushClipRect/PopClipRect/PopTextureId on multiple Begin/End pairs

ImDrawList: merge draw command better, cases of multiple Begin/End gets merged properly

Fixed appending multiple times to an existing child via multiple calls to same BeginChild/EndChild

Removed a few empty lines

Updated FAQ for usage of ## to display empty label

InputText: Fixed cursor generating a zero-width wireframe rectangle turning into a division by zero.

WIP Menus: fixed recycling menu level during the same frame (#126) ...

We could also enforce "clearing" the window and recycle immediate which
sort of work, but it would be a less tested code path.

WIP Menus: tidying up, fixed hovering in parent popup menu item from child popup (individual popups acts as hovering barrier) (#126)

WIP Menus: click again to toggle + allow hovering in same menuset even outside of a menubar (#126)

WIP Menus: menu opens on press (not release), uses popup style hovering, allow switch between menus at parent site (#126)

Merge remote-tracking branch 'origin' into 2015-05-menus

Hovering require to hover same child window. Reverted 860cf57 (December 3), replaced by a flag resize grip. ...

Might break something if you have childs overlapping non-childs.

Tweak internal ButtonBehavior() to ease passing extra options

WIP Menus: scrolling section of the window is clipped by the menu bar (#126)

WIP Menus: Added example menu, move app examples to a sub-menu (#126) ...

NB: menus do not react on click yet, with popup-style blocking of other
inputs yet

WIP Menus: BeginMenuBar() return false on window without a menu bar (#126)

Renamed ImGuiWindowFlags_Menu to ImGuiWindowFlags_ChildMenu

WIP Menus: fixed case where zero-sized display (e.g. minimised window) clips popups/menus and asserted (#126)

WIP Menus: fixed hovering handling of menus from menu bars (#126)

WIP Menus: menu bars. Still inconsistency with hovering scheme. Will probably follow what Windows does. (#126).

WIP Menus: further fixes for resizing (#126)

Selectable(): horizontal filling not declared to ItemSize() so Selectable(),SameLine() works and we can best auto-fit the window

Comments