ocornut
							
						 
					 | 
					
						
						
							
						
						904e187f70
					 | 
					
						
						
							
							Simplified some widget code, moving alignment to RenderTextClipped()
						
						
						
						
						
						
					 | 
					
						2015-05-27 14:39:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						3c264827fd
					 | 
					
						
						
							
							Reordering parameters of internal RenderTextClipped()
						
						
						
						
						
						
					 | 
					
						2015-05-27 14:24:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f841097e99
					 | 
					
						
						
							
							Button centering left to RenderTextClipped function.
						
						
						
						
						
						
					 | 
					
						2015-05-27 14:20:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f26de46350
					 | 
					
						
						
							
							Button() closes active popup (#126) unsure about that
						
						
						
						
						
						
					 | 
					
						2015-05-27 09:28:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e6ac9e88aa
					 | 
					
						
						
							
							Refactor Button() and SmallButton() into a shared function ButtonEx()
						
						
						
						
						
						
					 | 
					
						2015-05-27 09:22:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						b8ee48a74b
					 | 
					
						
						
							
							OpenPopup() Comments
						
						
						
						
						
						
					 | 
					
						2015-05-27 09:18:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						843219daec
					 | 
					
						
						
							
							Spacing + untabify
						
						
						
						
						
						
					 | 
					
						2015-05-26 22:14:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7b8b5754bc
					 | 
					
						
						
							
							EndGroup() carries on the text base offset from the last line of the group (sort of incorrect but better than nothing)
						
						
						
						
						
						
					 | 
					
						2015-05-26 22:13:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6f32684f15
					 | 
					
						
						
							
							Examples: various usage comments.
						
						
						
						
						
						
					 | 
					
						2015-05-26 21:36:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						15113f682e
					 | 
					
						
						
							
							Added TextDisabled(), TextDisabledV() helpers.
						
						
						
						
						
						
					 | 
					
						2015-05-26 21:10:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						3a6e6645e6
					 | 
					
						
						
							
							WIP Menus: Fixed remaining inconsistency with stacks of popups. Activating/closing a menu close the parent popup. Added test case. (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-26 20:33:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						90cf77b191
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-05-menus
						
						
						
						
						
						
					 | 
					
						2015-05-26 18:03:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6b3ccd3edf
					 | 
					
						
						
							
							WIP Menus: Added support for disabled sub-menu (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-26 18:02:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0db122bc3b
					 | 
					
						
						
							
							Comments. Examples: added empty if (MenuItem()) {} statements in more places to better document the typical use cases (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-26 17:48:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						fdce095101
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-05-26 17:27:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d009a85de4
					 | 
					
						
						
							
							WIP Menus: Implement amazon's dropdown-like triangle test for navigating sub-menus (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-26 17:09:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						63a39dd08e
					 | 
					
						
						
							
							WIP Menus: Recursive menu demo (#126). Actually useful to test sub-menu positioning.
						
						
						
						
						
						
					 | 
					
						2015-05-26 16:14:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						cdb5e16f70
					 | 
					
						
						
							
							SelectableEx: use flags internally (similar to ButtonBehavior)
						
						
						
						
						
						
					 | 
					
						2015-05-26 16:12:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4eeba016f6
					 | 
					
						
						
							
							WIP Menus: Closing sub-menu when hovering something else in the same parent window (#126)
						
						
						
						
						
						
						
						Immediate open/close is error-prone 
						
						
					 | 
					
						2015-05-26 15:01:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						83b10f77a9
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-05-25 23:47:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						fd0108dbef
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-05-25 23:37:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						98540370a0
					 | 
					
						
						
							
							WIP Menus: Layout in menu-bar tweaks to lay better when mixed widgets (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-25 23:15:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						bb8cdcb916
					 | 
					
						
						
							
							WIP Menus: Layout in menu-bar more standard, allows mixing different widgets in menubar. (#126)
						
						
						
						
						
						
						
						Still some minor spacing bugs. 
						
						
					 | 
					
						2015-05-25 23:08:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						83cb040d20
					 | 
					
						
						
							
							Selectable: text baseline alignment for line that aren't of text height.
						
						
						
						
						
						
					 | 
					
						2015-05-25 23:03:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Guillemet
							
						 
					 | 
					
						
						
							
						
						2acdafe4f2
					 | 
					
						
						
							
							imgui_impl_sdl and main sample
						
						
						
						
						
						
					 | 
					
						2015-05-25 09:40:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						44ed5640d3
					 | 
					
						
						
							
							WIP Menus: Sub-menu overlapping amount not hardcoded (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-24 23:58:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0836f69d9b
					 | 
					
						
						
							
							WIP Menus: Fixed style.WindowPadding == 0 leading to zero-sized initial clipping rectangle leading to self-collapsing childs (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-24 23:56:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6c749934ec
					 | 
					
						
						
							
							Combo: empty label doesn't add ItemInnerSpacing alignment, matching other widgets
						
						
						
						
						
						
					 | 
					
						2015-05-24 23:45:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						9abcbf73cb
					 | 
					
						
						
							
							WIP Menus: Sub-menus appears over the parent-menu scrollbar if there is one (unsure about that) (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-24 23:37:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						63aa035f59
					 | 
					
						
						
							
							WIP Menus: Fixed estimation of scrollbar width (broke in 292f08b11e) (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-24 23:25:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8c1d7daef8
					 | 
					
						
						
							
							WIP Menus: Fixed repositioning of menus when there's no room in the 4 quadrants., we still keep them within the visible display area (#126)
						
						
						
						
						
						
						
						vs popup which prefer to stay away from the mouse cursor 
						
						
					 | 
					
						2015-05-24 23:17:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |