ocornut 
							
						 
					 
					
						
						
							
						
						0f9addb002 
					 
					
						
						
							
							Minor shuffle to ease merging branches. (tentative. fugly but those fields will be removed anyway)  
						
						
						
						
					 
					
						2016-08-11 23:20:53 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						bfe1e163b8 
					 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2016-02-colorpicker  
						
						
						
						
					 
					
						2016-08-11 23:01:48 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						2afffcdeb9 
					 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2016-07-navigation  
						
						
						
						
					 
					
						2016-08-11 23:00:47 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						4bc3f9d1f7 
					 
					
						
						
							
							Minor shuffle to ease merging branches.  
						
						
						
						
					 
					
						2016-08-11 22:59:44 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						996eb080fa 
					 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2016-02-colorpicker  
						
						
						
						
					 
					
						2016-08-11 22:53:26 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						df1d1b5b25 
					 
					
						
						
							
							Nav: DragBehavior: Adjust minimum step to displayed precision when using navigation ( #323 ,  #180 )  
						
						
						
						
					 
					
						2016-08-07 20:40:57 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						09cba02d3f 
					 
					
						
						
							
							Nav: DragBehavior: Fix for fast speed ( #323   #180 )  
						
						
						
						
					 
					
						2016-08-07 20:31:51 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						761a74c62b 
					 
					
						
						
							
							Selectable/MenuItem: Not activated on Click but only on Release is more standard ( #126 ,  #245 ,  #323 )  
						
						... 
						
						
						
						Apparently menu items started with OnClick (vs OnClickHoldRelease) when
doing #126 . Hope to not break anything.
Also allows using xxx_DontClosePopup flags. 
						
						
					 
					
						2016-08-07 20:21:18 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						8828889d5e 
					 
					
						
						
							
							Refactored rare transient bool stacks into a set of flags, added unexposed ImGuiItemFlags_SelectableDontClosePopup ( #323 )  
						
						
						
						
					 
					
						2016-08-07 20:05:24 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						785f51227a 
					 
					
						
						
							
							Demo tweaks  
						
						
						
						
					 
					
						2016-08-07 19:07:24 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						525ef5b357 
					 
					
						
						
							
							Nav: Tweaked default highlight clipping (clipped by scrollbar) and removed subtle background ( #323 )  
						
						
						
						
					 
					
						2016-08-07 15:31:00 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						a68132948b 
					 
					
						
						
							
							Nav: Added ImGuiCol_NavWindowingHighlight into style ( #323 )  
						
						
						
						
					 
					
						2016-08-07 15:26:04 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						6aa8019763 
					 
					
						
						
							
							Nav: Fixed bug where pressing NavInput(Triangle) to turn slider/drag into text input would then change subsequent NavActivate as well ( #323 )  
						
						
						
						
					 
					
						2016-08-07 15:19:29 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						e55882f74b 
					 
					
						
						
							
							Nav: Allow PadLeft to close a menu ( #323 )  
						
						
						
						
					 
					
						2016-08-07 15:18:04 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						c203be94c6 
					 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2016-07-navigation  
						
						
						
						
					 
					
						2016-08-07 13:55:59 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						6eb35b8a04 
					 
					
						
						
							
							BulletText(): doesn't stop displaying at the ## mark  
						
						
						
						
					 
					
						2016-08-07 13:53:41 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						8a6d209f68 
					 
					
						
						
							
							Nav: Failed movement request with no current NavId fallback to an InitDefaultRequest so that we always land somewhere on first move ( #323 )  
						
						
						
						
					 
					
						2016-08-07 13:34:25 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						5ef8452509 
					 
					
						
						
							
							Nav: Comments ( #323 )  
						
						
						
						
					 
					
						2016-08-07 13:33:15 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						cbf24c13ca 
					 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2016-07-navigation  
						
						
						
						
					 
					
						2016-08-07 12:15:21 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						5d1a0a6f77 
					 
					
						
						
							
							Removed a handful of obsolete (trivial) function redirection from 1.34 and 1.38 (march-april 2015)  
						
						... 
						
						
						
						OpenNextNode() -> SetNextTreeNodeOpen()
GetWindowIsFocused() -> IsWindowFocused()
GetItemBoxMin() -> GetItemRectMin()
GetItemBoxMax() -> GetItemRectMax()
IsMouseHoveringBox() -> IsMouseHoveringRect()
IsClipped() -> !IsRectVisible() 
						
						
					 
					
						2016-08-06 09:48:04 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						aa9786077c 
					 
					
						
						
							
							Merge branch 'thedmd-2016-08-generalized_visibility_test'  
						
						
						
						
					 
					
						2016-08-06 09:40:38 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						b8397c2933 
					 
					
						
						
							
							Tweak comments ( #768 )  
						
						
						
						
					 
					
						2016-08-06 09:40:26 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						a1521534ba 
					 
					
						
						
							
							Merge branch '2016-08-generalized_visibility_test' of  https://github.com/thedmd/imgui  into thedmd-2016-08-generalized_visibility_test  
						
						
						
						
					 
					
						2016-08-06 09:36:24 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						af33efb146 
					 
					
						
						
							
							Using IM_COL32() for colors in a few spots ( #767 )  
						
						
						
						
					 
					
						2016-08-06 09:35:05 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						a7f6ea592f 
					 
					
						
						
							
							Moved GetColorU32 out of imgui_internal.h to avoid inlining mess ( #759 )  
						
						
						
						
					 
					
						2016-08-06 09:22:41 +02:00 
						 
				 
			
				
					
						
							
							
								Michał Cichoń 
							
						 
					 
					
						
						
							
						
						7588dfb67e 
					 
					
						
						
							
							Add ability to test arbitrary rectangle for visibility without need of moving cursor.  
						
						
						
						
					 
					
						2016-08-05 11:47:16 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						d85c1be6b6 
					 
					
						
						
							
							Nav: Reordered Cancel handling code so you you can leave a child within a popup without closing the popup ( #323 )  
						
						
						
						
					 
					
						2016-08-04 12:53:46 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						c263961f07 
					 
					
						
						
							
							Nav: Menu: Allow PadDown to open a menu from a menu bar, PadRight from a menu ( #323 ,  #126 )  
						
						
						
						
					 
					
						2016-08-04 10:41:33 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						dcff032429 
					 
					
						
						
							
							Nav: Moving all nav inputs to io.NavInputs[] float array, new enum labelled for gamepad. ( #323 )  
						
						
						
						
					 
					
						2016-08-03 23:23:04 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						4ccc87c91d 
					 
					
						
						
							
							Typo in commented default-value  
						
						
						
						
					 
					
						2016-08-03 21:53:07 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						c0dcef4e16 
					 
					
						
						
							
							Nav: Moving window with nav stick disables mouse hover ( #323 )  
						
						
						
						
					 
					
						2016-08-03 21:02:27 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						4e91b521ee 
					 
					
						
						
							
							Demo: Arrange some inputs panels.  
						
						
						
						
					 
					
						2016-08-03 20:55:54 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						36fa2b9523 
					 
					
						
						
							
							Nav: DragBehavior  removed bogus test ( #323 )  
						
						
						
						
					 
					
						2016-08-01 22:23:56 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						d0801057ba 
					 
					
						
						
							
							Demo: Tweak handling of "animate" flag in graph demo so it doesn't keep running.  
						
						
						
						
					 
					
						2016-08-01 20:55:54 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						2e52bee12e 
					 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2016-07-navigation  
						
						
						
						
					 
					
						2016-07-31 17:00:44 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						907265d632 
					 
					
						
						
							
							Using ImGuiID instead of ImU32 is a few places  
						
						
						
						
					 
					
						2016-07-31 16:48:06 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						8b190f1100 
					 
					
						
						
							
							Nav: quick tap on NavMenu with no focused window doesn't focus one (holding still does) ( #323 )  
						
						
						
						
					 
					
						2016-07-31 16:12:01 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						e9c881e4de 
					 
					
						
						
							
							Nav: fixed using NavMenu/windowing select when no window is already focused + cleanup code ( #323 )  
						
						
						
						
					 
					
						2016-07-31 16:07:58 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						1ecbf73c97 
					 
					
						
						
							
							Nav: working on early bits of documentation ( #323 )  
						
						
						
						
					 
					
						2016-07-31 15:41:51 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						a154625a56 
					 
					
						
						
							
							Nav: Not exposing ImGuiWindowFlags_NavFlattened because it requires much more work ( #323 )  
						
						
						
						
					 
					
						2016-07-31 13:40:14 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						08a28c16ae 
					 
					
						
						
							
							Nav: Merge FocusedWindow and NavWindow that were basically duplicate at this point ( #323 )  
						
						
						
						
					 
					
						2016-07-31 13:38:57 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						2545d75c3b 
					 
					
						
						
							
							Tidying up, removed two unnecessary window flags from being exposed in imgui.h  
						
						
						
						
					 
					
						2016-07-31 13:05:13 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						b3cba62b80 
					 
					
						
						
							
							Nav: Added experiment ImGuiWindowFlags_NavFlattened flag to cross over between parent and non-scrolling child windows ( #323 )  
						
						
						
						
					 
					
						2016-07-31 12:55:23 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						769a1dd748 
					 
					
						
						
							
							Nav: No scrolling while using windowing functionalities ( #323 )  
						
						
						
						
					 
					
						2016-07-31 10:41:41 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9ab20e6c9c 
					 
					
						
						
							
							Merge pull request  #756  from jseward/master  
						
						... 
						
						
						
						Examples: SDL: Fix compile warnings. 
						
						
					 
					
						2016-07-31 09:28:21 +02:00 
						 
				 
			
				
					
						
							
							
								Jamie Seward 
							
						 
					 
					
						
						
							
						
						0a1d456de1 
					 
					
						
						
							
							Fix compile warnings in SDL examples  
						
						
						
						
					 
					
						2016-07-30 15:26:49 -07:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						a88d189f18 
					 
					
						
						
							
							Nav: MoveRequest doesn't affect io.NavUsable so that navigation failure doesn't trigger false positive & not needed (undo part of  3cc1419df)  
						
						
						
						
					 
					
						2016-07-30 23:52:03 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						f72e2fd1b1 
					 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2016-07-navigation  
						
						
						
						
					 
					
						2016-07-30 23:46:09 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						954c890c67 
					 
					
						
						
							
							SameLine() with explicit X position is relative to left of group/columns (ref  #746 ,  #125 ,  #630 )  
						
						
						
						
					 
					
						2016-07-30 23:41:44 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						68b73b61b5 
					 
					
						
						
							
							Nav: Comment ( #323 )  
						
						
						
						
					 
					
						2016-07-30 23:17:32 +02:00