omar 
							
						 
					 
					
						
						
							
						
						2a32a2e662 
					 
					
						
						
							
							Demos: Tweaks of popups/context/menus section.  
						
						
						
						
					 
					
						2017-10-20 12:38:48 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e384078d7a 
					 
					
						
						
							
							IO: reordering some supposedly private fields.  
						
						
						
						
					 
					
						2017-10-19 22:49:36 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						51eed2f257 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						
						
						
					 
					
						2017-10-19 19:42:27 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5b699517d4 
					 
					
						
						
							
							Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)  
						
						
						
						
					 
					
						2017-10-19 19:42:19 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						22977ffedb 
					 
					
						
						
							
							Documentation: Extra comments + tweaks to make usage of long-line more bearable.  
						
						
						
						
					 
					
						2017-10-19 19:30:46 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d3c2e904d8 
					 
					
						
						
							
							Internals: Added ImLinearSweep() helper.  
						
						
						
						
					 
					
						2017-10-19 19:29:59 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						938f1b720f 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 
					
						2017-10-19 00:04:53 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						370a48c10b 
					 
					
						
						
							
							Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir  
						
						
						
						
					 
					
						2017-10-18 23:46:16 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						073dd60b4b 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						
						
						
					 
					
						2017-10-18 19:55:34 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a03093b2d4 
					 
					
						
						
							
							CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 ,  #787 )  
						
						
						
						
					 
					
						2017-10-18 19:55:08 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						29a652adee 
					 
					
						
						
							
							CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 ,  #787 )  
						
						
						
						
					 
					
						2017-10-18 19:51:32 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a126c702d9 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui_internal.h 
						
						
					 
					
						2017-10-18 13:09:28 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ef3f87eec5 
					 
					
						
						
							
							Internals: ButtonBehavior: made ImGuiButtonFlags_PressedOnClick and ImGuiButtonFlags_PressedOnDoubleClick set the click offset correctly + hold on g.ActiveId so Held state can be reported. Added ImGuiButtonFlags_NoHoldingActiveId flag to disable the later.  
						
						
						
						
					 
					
						2017-10-18 13:08:25 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						1c4af303bf 
					 
					
						
						
							
							Internals:Helpers:  Added ImSwap(int,int), exposed ImStrncpy().  
						
						
						
						
					 
					
						2017-10-18 13:08:14 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						bf778ebb7e 
					 
					
						
						
							
							Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker.  
						
						
						
						
					 
					
						2017-10-18 13:06:49 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d96b6ecf88 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui_demo.cpp 
						
						
					 
					
						2017-10-17 16:20:35 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						03b76bf05b 
					 
					
						
						
							
							Begin: Marked 5 parameters version of Begin() as obsolete. Now waiting for a riot to happen!  
						
						
						
						
					 
					
						2017-10-17 16:19:21 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						78a85ba3fe 
					 
					
						
						
							
							Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4)  
						
						
						
						
					 
					
						2017-10-17 16:15:46 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						2739b6ebcd 
					 
					
						
						
							
							Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)  
						
						
						
						
					 
					
						2017-10-17 16:14:20 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4aa9d2089d 
					 
					
						
						
							
							Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2)  
						
						
						
						
					 
					
						2017-10-17 15:51:20 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						55d873875e 
					 
					
						
						
							
							Begin: Work toward obsoleting the 5-arguments Begin() overload. (1)  
						
						
						
						
					 
					
						2017-10-17 15:47:55 +02:00 
						 
				 
			
				
					
						
							
							
								Gargaj 
							
						 
					 
					
						
						
							
						
						839067fda9 
					 
					
						
						
							
							Capture/release window in DX9 implementation  
						
						... 
						
						
						
						This helps a lot when the user drags a slider but carries the cursor offscreen before releasing the button - without the capturing, the slider will "stick" to the mouse cursor even after the button has been released. (This should generally be added to all Windows implementations - I won't mind doing it if you think it's a good idea.) 
						
						
					 
					
						2017-10-17 12:37:21 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						1a35766356 
					 
					
						
						
							
							BeginPopupContextItem() now supports a NULL string identifier and uses the last item ID if available. For interactive items (that have an ID) this works! For non interactive items we assert.  
						
						
						
						
					 
					
						2017-10-16 23:37:12 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c76f014292 
					 
					
						
						
							
							Fix IsItemHovered() issue on child by temporarily reverting  344d48be31. This is not the ideal solution. ( Fix   #1370 )  
						
						
						
						
					 
					
						2017-10-16 16:41:09 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						af565ea828 
					 
					
						
						
							
							Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )  
						
						
						
						
					 
					
						2017-10-16 02:41:28 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7ea52ac1e4 
					 
					
						
						
							
							Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )  
						
						
						
						
					 
					
						2017-10-16 02:30:59 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						82a27fd3aa 
					 
					
						
						
							
							Nav: InputText: Fixed using Up/Down history callback feature when Nav is enabled ( #787 )  
						
						
						
						
					 
					
						2017-10-16 02:06:42 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						b70c2fa887 
					 
					
						
						
							
							Nav: Internals: Moved some internal code to namespace, comments  
						
						
						
						
					 
					
						2017-10-16 00:46:23 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ae1866c424 
					 
					
						
						
							
							Nav: NavProcessItem() updates current NavLayer. Basically we're hearing toward rebuilidng nav info from an id. ( #787 ).  
						
						
						
						
					 
					
						2017-10-16 00:38:42 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						97851f7376 
					 
					
						
						
							
							Nav: NavProcessItem() computes window-relative rectangle using own Window rather than NavWindow. Not sure what it may mean for child-flattened-nav (disabled). ( #787 )  
						
						
						
						
					 
					
						2017-10-16 00:36:31 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7d14262202 
					 
					
						
						
							
							Nav: SetFocusID() update NavWindow and NavRectRel just as we get them. Needed by upcoming commit, committing separately as I'm curious if it has any side-effect. ( #787 )  
						
						
						
						
					 
					
						2017-10-16 00:33:30 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						633f60cdb2 
					 
					
						
						
							
							Update README.md  
						
						
						
						
					 
					
						2017-10-15 21:30:06 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						83416fa5da 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						
						
						
					 
					
						2017-10-15 21:28:17 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e32569dd5a 
					 
					
						
						
							
							ImDrawList: Fixed a bug in ChannelsMerge() leading to an extraneous draw call being created, which unexpectly led to more dramatic condition but to faulty draw command merging code. ( #1172 ,  #1368 )  
						
						
						
						
					 
					
						2017-10-15 21:07:22 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						bebc49bc2a 
					 
					
						
						
							
							Merge pull request  #1368  from ripieces/rendering-issue-1172  
						
						... 
						
						
						
						ImDrawList: Merging issue fix. 
						
						
					 
					
						2017-10-15 21:07:05 +02:00 
						 
				 
			
				
					
						
							
							
								Dominik Tugend 
							
						 
					 
					
						
						
							
						
						7a8eb5bdc9 
					 
					
						
						
							
							Rendering issue fix  
						
						... 
						
						
						
						Fixes  ocornut/imgui#1172  
					
						2017-10-15 19:27:53 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d761825cfb 
					 
					
						
						
							
							Nav: Renaming a field + Comments.  
						
						
						
						
					 
					
						2017-10-15 17:57:15 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ce7b04e8b9 
					 
					
						
						
							
							Removed apparently unncessary code in InputFloatN() and InputInt().  
						
						
						
						
					 
					
						2017-10-13 23:59:17 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						251bc6c22c 
					 
					
						
						
							
							Update README.md  
						
						
						
						
					 
					
						2017-10-13 21:29:31 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						b498856c9d 
					 
					
						
						
							
							Update README.md  
						
						
						
						
					 
					
						2017-10-13 20:05:50 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						dbab9b248a 
					 
					
						
						
							
							Update README.md  
						
						
						
						
					 
					
						2017-10-13 20:03:56 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						db5f1b79cd 
					 
					
						
						
							
							Nav: ButtonBehavior() keep _displaying_ NavId item as howered when refocusing or moving window, which is consistent with IsItemHovered() and reduce noise/flicker ( #787 )  
						
						
						
						
					 
					
						2017-10-13 19:18:59 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c42baf392a 
					 
					
						
						
							
							Reluctantly exposed GetActiveID(), GetHoveredID() in imgui_internal because the demo code will need it.  
						
						
						
						
					 
					
						2017-10-13 16:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						53780a4fcc 
					 
					
						
						
							
							Nav: Shallow tweaks.  
						
						
						
						
					 
					
						2017-10-13 16:23:44 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f852b9a52a 
					 
					
						
						
							
							Exposed Scrollbar() in imgui_internal.h and removed a bool arg  
						
						
						
						
					 
					
						2017-10-13 13:31:34 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						b667d5a9e7 
					 
					
						
						
							
							Nav: Internals: Renamed ImGuiButtonFlags_NoNavOverride to ImGuiButtonFlags_NoNavFocus + fixed a theorically missing test in ButtonBehavior() ( #787 )  
						
						
						
						
					 
					
						2017-10-13 13:31:34 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0371219222 
					 
					
						
						
							
							Nav: Internals: Renamed SetActiveIDNoNav -> SetActiveID() and old SetActiveID() -> SetFocusID(), both functions needs to be called when both are desirabled. ( #787 )  
						
						... 
						
						
						
						May break code relying on imgui_internal.h, relying on nav and not calling ButtonBehavior(). 
						
						
					 
					
						2017-10-13 13:31:34 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						8b095e483b 
					 
					
						
						
							
							Internals: Moved SetNavID() and renamed casing to be consistent with stuff exposed in imgui_internal.h  
						
						
						
						
					 
					
						2017-10-13 13:31:34 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4be967823f 
					 
					
						
						
							
							Exposed Scrollbar() in imgui_internal.h and removed a bool arg  
						
						
						
						
					 
					
						2017-10-13 13:30:28 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						48498b337d 
					 
					
						
						
							
							Internals: SetActiveID window cannot be NULL  
						
						
						
						
					 
					
						2017-10-13 13:07:07 +02:00