51eed2f257 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into navigation  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								5b699517d4 
								
							
								 
							
						 
						
							
							
								
								Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								22977ffedb 
								
							
								 
							
						 
						
							
							
								
								Documentation: Extra comments + tweaks to make usage of long-line more bearable.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								d3c2e904d8 
								
							
								 
							
						 
						
							
							
								
								Internals: Added ImLinearSweep() helper.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								938f1b720f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into navigation  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								370a48c10b 
								
							
								 
							
						 
						
							
							
								
								Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								073dd60b4b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into navigation  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								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 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								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 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								a126c702d9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into navigation  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								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.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								1c4af303bf 
								
							
								 
							
						 
						
							
							
								
								Internals:Helpers:  Added ImSwap(int,int), exposed ImStrncpy().  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								bf778ebb7e 
								
							
								 
							
						 
						
							
							
								
								Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								d96b6ecf88 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into navigation  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui_demo.cpp 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								03b76bf05b 
								
							
								 
							
						 
						
							
							
								
								Begin: Marked 5 parameters version of Begin() as obsolete. Now waiting for a riot to happen!  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								78a85ba3fe 
								
							
								 
							
						 
						
							
							
								
								Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4)  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								2739b6ebcd 
								
							
								 
							
						 
						
							
							
								
								Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								4aa9d2089d 
								
							
								 
							
						 
						
							
							
								
								Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2)  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								55d873875e 
								
							
								 
							
						 
						
							
							
								
								Begin: Work toward obsoleting the 5-arguments Begin() overload. (1)  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								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.) 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								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.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								c76f014292 
								
							
								 
							
						 
						
							
							
								
								Fix IsItemHovered() issue on child by temporarily reverting  344d48be31. This is not the ideal solution. ( Fix   #1370 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								af565ea828 
								
							
								 
							
						 
						
							
							
								
								Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								7ea52ac1e4 
								
							
								 
							
						 
						
							
							
								
								Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								82a27fd3aa 
								
							
								 
							
						 
						
							
							
								
								Nav: InputText: Fixed using Up/Down history callback feature when Nav is enabled ( #787 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								b70c2fa887 
								
							
								 
							
						 
						
							
							
								
								Nav: Internals: Moved some internal code to namespace, comments  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								ae1866c424 
								
							
								 
							
						 
						
							
							
								
								Nav: NavProcessItem() updates current NavLayer. Basically we're hearing toward rebuilidng nav info from an id. ( #787 ).  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								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 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								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 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								633f60cdb2 
								
							
								 
							
						 
						
							
							
								
								Update README.md  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								83416fa5da 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into navigation  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								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 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								bebc49bc2a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1368  from ripieces/rendering-issue-1172  
							
							... 
							
							
 
							
							ImDrawList: Merging issue fix. 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								7a8eb5bdc9 
								
							
								 
							
						 
						
							
							
								
								Rendering issue fix  
							
							... 
							
							
 
							
							Fixes  ocornut/imgui#1172  
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								d761825cfb 
								
							
								 
							
						 
						
							
							
								
								Nav: Renaming a field + Comments.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								ce7b04e8b9 
								
							
								 
							
						 
						
							
							
								
								Removed apparently unncessary code in InputFloatN() and InputInt().  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								251bc6c22c 
								
							
								 
							
						 
						
							
							
								
								Update README.md  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								b498856c9d 
								
							
								 
							
						 
						
							
							
								
								Update README.md  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								dbab9b248a 
								
							
								 
							
						 
						
							
							
								
								Update README.md  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								db5f1b79cd 
								
							
								 
							
						 
						
							
							
								
								Nav: ButtonBehavior() keep _displaying_ NavId item as howered when refocusing or moving window, which is consistent with IsItemHovered() and reduce noise/flicker ( #787 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								c42baf392a 
								
							
								 
							
						 
						
							
							
								
								Reluctantly exposed GetActiveID(), GetHoveredID() in imgui_internal because the demo code will need it.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								53780a4fcc 
								
							
								 
							
						 
						
							
							
								
								Nav: Shallow tweaks.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								f852b9a52a 
								
							
								 
							
						 
						
							
							
								
								Exposed Scrollbar() in imgui_internal.h and removed a bool arg  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								b667d5a9e7 
								
							
								 
							
						 
						
							
							
								
								Nav: Internals: Renamed ImGuiButtonFlags_NoNavOverride to ImGuiButtonFlags_NoNavFocus + fixed a theorically missing test in ButtonBehavior() ( #787 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								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(). 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								8b095e483b 
								
							
								 
							
						 
						
							
							
								
								Internals: Moved SetNavID() and renamed casing to be consistent with stuff exposed in imgui_internal.h  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								4be967823f 
								
							
								 
							
						 
						
							
							
								
								Exposed Scrollbar() in imgui_internal.h and removed a bool arg  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								48498b337d 
								
							
								 
							
						 
						
							
							
								
								Internals: SetActiveID window cannot be NULL  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								4548bcb5c9 
								
							
								 
							
						 
						
							
							
								
								Nav: commiting shallow bits to reduce noise from working copy/upcoming commit.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								17519c313a 
								
							
								 
							
						 
						
							
							
								
								Nav: Extract part of NavUpdate() into a saner NavUpdateWindowingTarget() ( #787 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)