mark/imgui

Fork: 0

mark / imgui

2017-12-12	7faa5b1 Browse files » Tweak omar committed on 12 Dec 2017
	3ea5e67 Browse files » Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_demo.cpp omar committed on 12 Dec 2017
	02e0a07 Browse files » Begin: Tidying up code to make it more readable. omar committed on 12 Dec 2017
	28bbf1a Browse files » Fixed ParentWindow setup which broke Modal windows (fix `c65124f`) omar committed on 12 Dec 2017
	d561a43 Browse files » Drag and Drop: Drop target infer a fallback ID from the rectangle. Avoid Preview being accepted on drop frame when drop target has no ID. (#143) omar committed on 12 Dec 2017
	ef1a683 Browse files » Removed use of obsolete ImGui API. Branimir Karadžić authored on 12 Dec 2017 omar committed on 12 Dec 2017
	e98df91 Browse files » Drag and Drop: Added ImGuiCol_DragDropTarget (#143, #707) omar committed on 12 Dec 2017
	7ec934f Browse files » Drag and Drop: Comments omar committed on 12 Dec 2017
	052b602 Browse files » Merge branch 'master' into drag_and_drop ... # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h omar committed on 12 Dec 2017
	0a3db26 Browse files » Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h omar committed on 12 Dec 2017
	6190ab0 Browse files » Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing() omar committed on 12 Dec 2017
	c226579 Browse files » Added GetFrameHeight() function (used to be SmallSquareSize internally) omar committed on 12 Dec 2017
	ee7f192 Browse files » Internals: Added GetSmallSquareSize() omar committed on 12 Dec 2017
	08b72eb Browse files » IsWindowFocused() refactor will flags. (#1382) ... Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow). Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows). omar committed on 12 Dec 2017
	8d8f493 Browse files » Demo: mouse dragging demo tweaks omar committed on 12 Dec 2017
	fa179d0 Browse files » Reordered ImGuiHoveredFlags to match upcoming ImGuiFocusedFlags (#1382) omar committed on 12 Dec 2017
	de4a851 Browse files » Font documentation update (#1498) omar committed on 12 Dec 2017
	c65124f Browse files » Internals: ParentWindow is now NULL for non-child windows and means what everyone expects. omar committed on 12 Dec 2017
	f42d7b8 Browse files » Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing. omar committed on 12 Dec 2017
	4a555d3 Browse files » IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. (#1382) omar committed on 12 Dec 2017
2017-12-11	185c1ea Browse files » Alignment + removed comments omar committed on 11 Dec 2017
	f939455 Browse files » Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. (#600, #1330) omar committed on 11 Dec 2017
	45f440b Browse files » Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap omar committed on 11 Dec 2017
	6b168b4 Browse files » Comments (#822) omar committed on 11 Dec 2017
	2b9d8ab Browse files » Merge branch 'master' into drag_and_drop ... # Conflicts: # imgui.cpp # imgui.h omar committed on 11 Dec 2017
	38bfdb3 Browse files » Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h omar committed on 11 Dec 2017
	f06f68f Browse files » Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016) omar committed on 11 Dec 2017
	9fd15de Browse files » Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. (#787) omar committed on 11 Dec 2017
	6d93011 Browse files » alloca fix to allow Clang with Microsoft CodeGen path omar committed on 11 Dec 2017
	e67f380 Browse files » Replaced obsolete function with new one. Branimir Karadžić authored on 10 Dec 2017 omar committed on 11 Dec 2017