ocornut
							
						 
					 | 
					
						
						
							
						
						1ab1712849
					 | 
					
						
						
							
							WIP Menus: Clicking the label of an already open sub-menu doesn't close it unless from a menu-bar (match Windows behavior) (#126)
						
						
						
						
						
						
						
						Argh, 
						
						
					 | 
					
						2015-05-24 22:33:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						48ede93a58
					 | 
					
						
						
							
							WIP Menus:  Fixed closing popup on menu item activation when a child menu is open from the popup (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-24 22:30:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						3498617a3c
					 | 
					
						
						
							
							Comments.
						
						
						
						
						
						
					 | 
					
						2015-05-24 22:16:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						53892ab893
					 | 
					
						
						
							
							WIP Menus: Fixed manually closing submenu affecting position of the following window (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-24 21:20:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						292f08b11e
					 | 
					
						
						
							
							WIP Menus: Fixed some alignment issues with non standard styles. Tweaked menu-bar color (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-24 21:11:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						14bcfef041
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-05-menus
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp 
						
						
					 | 
					
						2015-05-24 17:32:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8cfae35042
					 | 
					
						
						
							
							Added Dummy() helper
						
						
						
						
						
						
					 | 
					
						2015-05-24 17:30:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						89d1340225
					 | 
					
						
						
							
							WIP Menus: Added Enabled/Disabled option for MenuItem() (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-23 13:54:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						485832fe06
					 | 
					
						
						
							
							WIP Menus: Added BeginMainMenuBar()/EndMainMenuBar() helpers. Added to examples.
						
						
						
						
						
						
					 | 
					
						2015-05-23 13:43:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e6b1e39847
					 | 
					
						
						
							
							WIP Menus: don't clamp windows within display when a position has been explicitly set by user. Menu item spacing uses ItemSpacing. (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-23 13:43:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e7097d6176
					 | 
					
						
						
							
							WIP Menus: menus now affected by WindowMinSize (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-23 13:03:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e3f2ad728a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
						
						
						
						
						
						
						
						Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp 
						
						
					 | 
					
						2015-05-21 22:57:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						cc3ed515ca
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp 
						
						
					 | 
					
						2015-05-21 22:52:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						882b4a5eb4
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-05-menus
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp 
						
						
					 | 
					
						2015-05-21 22:51:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7fbe6574c6
					 | 
					
						
						
							
							Removed unnecessary PushTextureId/PushClipRect/PopClipRect/PopTextureId on multiple Begin/End pairs
						
						
						
						
						
						
					 | 
					
						2015-05-21 22:45:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8a6d543bc9
					 | 
					
						
						
							
							ImDrawList: merge draw command better, cases of multiple Begin/End gets merged properly
						
						
						
						
						
						
					 | 
					
						2015-05-21 22:43:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6a1eba2d0a
					 | 
					
						
						
							
							Fixed appending multiple times to an existing child via multiple calls to same BeginChild/EndChild
						
						
						
						
						
						
					 | 
					
						2015-05-21 22:21:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						14ab9708be
					 | 
					
						
						
							
							Removed a few empty lines
						
						
						
						
						
						
					 | 
					
						2015-05-20 10:31:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						df276b82da
					 | 
					
						
						
							
							Updated FAQ for usage of ## to display empty label
						
						
						
						
						
						
					 | 
					
						2015-05-19 23:33:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						30a0193d73
					 | 
					
						
						
							
							Merge pull request #229 from gordonmcshane/osx-example-fix
						
						
						
						
						
						
						
						Examples: OpenGL3: Fix for OSX requiring forward compatibility flag (see #229) 
						
						
					 | 
					
						2015-05-19 10:36:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e43c5cd3d3
					 | 
					
						
						
							
							InputText: Fixed cursor generating a zero-width wireframe rectangle turning into a division by zero.
						
						
						
						
						
						
					 | 
					
						2015-05-18 23:42:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						92ded00fd9
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-05-menus
						
						
						
						
						
						
						
						Conflicts:
	imgui.h 
						
						
					 | 
					
						2015-05-18 23:32:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon McShane
							
						 
					 | 
					
						
						
							
						
						6ee65fc5af
					 | 
					
						
						
							
							Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX
						
						
						
						
						
						
					 | 
					
						2015-05-18 18:26:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						da53caf310
					 | 
					
						
						
							
							Moved ImVector<> after the main block (#219)
						
						
						
						
						
						
					 | 
					
						2015-05-18 22:33:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						b6f3c97e3b
					 | 
					
						
						
							
							Examples: DirectX11: explicitly set rasterizer state.
						
						
						
						
						
						
					 | 
					
						2015-05-18 21:38:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0cdd050cd7
					 | 
					
						
						
							
							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. 
						
						
					 | 
					
						2015-05-18 21:26:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6da8a77fa3
					 | 
					
						
						
							
							WIP Menus: tidying up, fixed hovering in parent popup menu item from child popup (individual popups acts as hovering barrier) (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-18 19:41:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						9bdacaf08d
					 | 
					
						
						
							
							WIP Menus: click again to toggle + allow hovering in same menuset even outside of a menubar (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-18 19:12:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						75ec4841df
					 | 
					
						
						
							
							WIP Menus: menu opens on press (not release), uses popup style hovering, allow switch between menus at parent site (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-18 18:44:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e674df8101
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-05-menus
						
						
						
						
						
						
					 | 
					
						2015-05-18 16:45:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						097fe51f97
					 | 
					
						
						
							
							Hovering require to hover same child window. Reverted 860cf578f5 (December 3), replaced by a flag resize grip.
						
						
						
						
						
						
						
						Might break something if you have childs overlapping non-childs. 
						
						
					 | 
					
						2015-05-18 16:42:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						060f879816
					 | 
					
						
						
							
							Tweak internal ButtonBehavior() to ease passing extra options
						
						
						
						
						
						
					 | 
					
						2015-05-18 16:39:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7184de24b8
					 | 
					
						
						
							
							WIP Menus: scrolling section of the window is clipped by the menu bar (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-18 15:54:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0e8c2f9d41
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-05-18 14:10:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						a17c930d1f
					 | 
					
						
						
							
							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 
						
						
					 | 
					
						2015-05-17 23:19:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						09abf11e56
					 | 
					
						
						
							
							WIP Menus: BeginMenuBar() return false on window without a menu bar (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-17 23:13:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4bd43bdb35
					 | 
					
						
						
							
							Renamed ImGuiWindowFlags_Menu to ImGuiWindowFlags_ChildMenu
						
						
						
						
						
						
					 | 
					
						2015-05-17 22:28:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7f3f3891c0
					 | 
					
						
						
							
							WIP Menus: fixed case where zero-sized display (e.g. minimised window) clips popups/menus and asserted (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-17 22:15:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						88d7b3de23
					 | 
					
						
						
							
							WIP Menus: fixed hovering handling of menus from menu bars (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-17 17:21:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f2b738648f
					 | 
					
						
						
							
							WIP Menus: menu bars. Still inconsistency with hovering scheme. Will probably follow what Windows does. (#126).
						
						
						
						
						
						
					 | 
					
						2015-05-17 17:13:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e0594340ff
					 | 
					
						
						
							
							Moved internal window flags to higher bit-count
						
						
						
						
						
						
					 | 
					
						2015-05-17 16:29:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6251d37987
					 | 
					
						
						
							
							WIP Menus: further fixes for resizing (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-17 15:48:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f44526cc45
					 | 
					
						
						
							
							Selectable(): horizontal filling not declared to ItemSize() so Selectable(),SameLine() works and we can best auto-fit the window
						
						
						
						
						
						
					 | 
					
						2015-05-17 13:09:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e912bcb36d
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-05-17 12:10:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						ecda785cbc
					 | 
					
						
						
							
							Popups: fix to allow child popups to be opened from a normal window without an intermediate popup window.
						
						
						
						
						
						
					 | 
					
						2015-05-15 23:57:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4250357ed2
					 | 
					
						
						
							
							Selectable: using window->WindowPadding() to work within non-padded child windows
						
						
						
						
						
						
					 | 
					
						2015-05-15 22:39:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						79a95256e8
					 | 
					
						
						
							
							Window: fixed auto-fit calculation mismatch of whether a scrollbar will be added by maximum height clamping.
						
						
						
						
						
						
						
						Also honor NoScrollBar in the case of height clamping, not adding extra
horizontal space. 
						
						
					 | 
					
						2015-05-15 22:36:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						3115e546aa
					 | 
					
						
						
							
							Style editor: fixed slider for indent spacing.
						
						
						
						
						
						
					 | 
					
						2015-05-15 21:55:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						c1b55991c0
					 | 
					
						
						
							
							Window: fixed child window sizing lag + minimum size clamping lag
						
						
						
						
						
						
					 | 
					
						2015-05-15 21:40:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						70f83a3a65
					 | 
					
						
						
							
							Popups: child popups (menus) hidden on their first frame the same way as regular popup
						
						
						
						
						
						
					 | 
					
						2015-05-15 20:35:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |