Branimir Karadžić
							
						 
					 | 
					
						
						
							
						
						123fd73c8c
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'
						
						
						
						
						
						
					 | 
					
						2015-05-27 22:01:37 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Branimir Karadžić
							
						 
					 | 
					
						
						
							
						
						cd9244ab15
					 | 
					
						
						
							
							Define STBTT_DEF extern when STBTT not compiled with ImGui.
						
						
						
						
						
						
					 | 
					
						2015-05-27 16:12:52 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						dcc7df2b21
					 | 
					
						
						
							
							Added BeginPopupContextVoid() helper for completeness (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-27 23:28:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						235cca4f97
					 | 
					
						
						
							
							Fix to allow opening popup from a left-click on void or another window (because left-click would normally override focus immediately) (#126)
						
						
						
						
						
						
						
						Neither appears to be really useful frankly. 
						
						
					 | 
					
						2015-05-27 23:24:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						1cb6a294b0
					 | 
					
						
						
							
							BeginPopupContextWindow() rearranged and clarified parameters (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-27 23:07:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						b0a9bbf6f6
					 | 
					
						
						
							
							Popup taking focus deactivate focused widget of other window (#126)
						
						
						
						
						
						
						
						e.g. focus InputText(), open contextual popup, input text used to stay
focused 
						
						
					 | 
					
						2015-05-27 22:58:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f8b7d5c76d
					 | 
					
						
						
							
							Tracking ActiveIdWindow along with ActiveId
						
						
						
						
						
						
					 | 
					
						2015-05-27 22:53:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						938528e5ee
					 | 
					
						
						
							
							Added BeginPopupContextItem() / BeginPopupContextWindow() (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-27 22:36:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						5b0861768e
					 | 
					
						
						
							
							Fixed GetId()/BeginPopup() accessing current window in "append" mode
						
						
						
						
						
						
					 | 
					
						2015-05-27 22:26:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8c4c421f74
					 | 
					
						
						
							
							Added IsAnyItemHovered() public helper.
						
						
						
						
						
						
					 | 
					
						2015-05-27 22:02:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						70f2ff0e5a
					 | 
					
						
						
							
							No minimum size for popups
						
						
						
						
						
						
					 | 
					
						2015-05-27 21:59:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						99ff45ad2e
					 | 
					
						
						
							
							Tweak context menu example
						
						
						
						
						
						
					 | 
					
						2015-05-27 21:42:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						90db64d4e3
					 | 
					
						
						
							
							Added context menu example on a DragFloat widget
						
						
						
						
						
						
					 | 
					
						2015-05-27 21:39:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						487500d291
					 | 
					
						
						
							
							Tweaks
						
						
						
						
						
						
					 | 
					
						2015-05-27 16:03:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7d28fe5915
					 | 
					
						
						
							
							WIP Menus: Reverted f26de46350 for now (#126)
						
						
						
						
						
						
					 | 
					
						2015-05-27 15:51:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d05c1d58c3
					 | 
					
						
						
							
							Oops
						
						
						
						
						
						
					 | 
					
						2015-05-27 15:44:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						405785ea62
					 | 
					
						
						
							
							ItemWidthStack can be empty, to remove one allocation per window
						
						
						
						
						
						
					 | 
					
						2015-05-27 15:42:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0a7024c198
					 | 
					
						
						
							
							Store common stacked settings contiguously in memory to reduce cache misses & unnecessary heap allocations
						
						
						
						
						
						
					 | 
					
						2015-05-27 15:35:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						3d36c81241
					 | 
					
						
						
							
							Added PushButtonRepeat() / PopButtonRepeat(). REMOVED third 'repeat_if_held' parameter of Button() !
						
						
						
						
						
						
					 | 
					
						2015-05-27 15:22:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d69f2f57ee
					 | 
					
						
						
							
							Added configurable io.KeyRepeatDelay, io.KeyRepeatRate
						
						
						
						
						
						
					 | 
					
						2015-05-27 15:17:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |