eb7033e75b 
								
							
								 
							
						 
						
							
							
								
								Version 1.66 WIP  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								b974fffea0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								e0cab5664a 
								
							
								 
							
						 
						
							
							
								
								Version 1.65  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								5a679a45cc 
								
							
								 
							
						 
						
							
							
								
								Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h. ( #1718 ,  #2036 )  
							
							... 
							
							
 
							
							If you were conveniently using the imgui copy of those STB headers in your project, you will have to update your include paths.
The reason for this change is to avoid conflicts for projects that may also be importing their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified. 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								a2616c79fe 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								e58bc3d5b7 
								
							
								 
							
						 
						
							
							
								
								Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								0b18c11440 
								
							
								 
							
						 
						
							
							
								
								Refactor: Moved ImFile functions. ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								ab64e8f993 
								
							
								 
							
						 
						
							
							
								
								Refactor: Moved one indentation level in the bulk of the ShowMetricsWindow() function. Should appear as a small diff if whitespaces changes are ignored. ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								31b5b18611 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								bb3184af74 
								
							
								 
							
						 
						
							
							
								
								Refactor: moved low-layout helpers to imgui_widgets.cpp (Spacing, Dummy, NewLine, Separator, etc.) ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								cbdce80837 
								
							
								 
							
						 
						
							
							
								
								Internals: Refactor: Moved render functions to their own section. ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								8601c39571 
								
							
								 
							
						 
						
							
							
								
								Viewport: Making the code a little more sturdy (flag changes) + added descriptions. ( #1542 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								af27ec296b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui.h 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								65876f348a 
								
							
								 
							
						 
						
							
							
								
								Nav: Removed the [Beta] tag from various descriptions of the gamepad/keyboard navigation system. Although it is not perfect and will keep being improved, it is fairly functional and used by many. ( #787 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								77ba883f23 
								
							
								 
							
						 
						
							
							
								
								Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. ( #1427 ) + changed ImGuiIO layout.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								bbcc976739 
								
							
								 
							
						 
						
							
							
								
								Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								b944aa623c 
								
							
								 
							
						 
						
							
							
								
								Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								a848807847 
								
							
								 
							
						 
						
							
							
								
								Minor inconsequential merges from Master/Docking branches  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								bdb30d7145 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								897e5c6231 
								
							
								 
							
						 
						
							
							
								
								Viewport: Moved code following refactor.  ( #2036 ,  #1542 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								40db2ca098 
								
							
								 
							
						 
						
							
							
								
								Fixed a build issue with non-Cygwin GCC under Windows.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								5451cb7e1e 
								
							
								 
							
						 
						
							
							
								
								Readme, Changelog ( #2059 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								1007873d94 
								
							
								 
							
						 
						
							
							
								
								Misc: merge minor/inconsequential stuff from Docking branch to reduce drift.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								f8b7e4d94f 
								
							
								 
							
						 
						
							
							
								
								Examples: imgui_impl_opengl3 Fix GLAD error condition ( #2059 ,  #2002 )  
							
							... 
							
							
 
							
							`gladLoadGL` returns 0 on fail, not the other way around. 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								d07f494305 
								
							
								 
							
						 
						
							
							
								
								Internals: Exposed SliderBehaviorT, DragBehaviorT, RoundScalarWithFormatT, SliderCalcRatioFromValueT. ( #2036 )  
							
							... 
							
							
 
							
							Renamed RoundScalarWithFormat -> RoundScalarWithFormatT.
Renamed SliderBehaviorCalcRatioFromValue -> SliderCalcRatioFromValueT 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								bcb1441ce7 
								
							
								 
							
						 
						
							
							
								
								Version 1.65 WIP  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								fd201a90f1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								767649afb1 
								
							
								 
							
						 
						
							
							
								
								Fix missing include on some systems to use intptr_t. ( #2036 ,  #2054 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								5d40d295b3 
								
							
								 
							
						 
						
							
							
								
								Comments, readme updates  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								be6ea86f8d 
								
							
								 
							
						 
						
							
							
								
								OSX: Added imgui_widgets.cpp to xcode project files.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								a52ce7ac8b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								fd90afef43 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) ( #2036 ,  #1542 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								5207afa0dd 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) ( #2036 ,  #1542 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								9174958b43 
								
							
								 
							
						 
						
							
							
								
								imgui_stl: Comments ( #2035 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								0699310b9c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'viewport_164' into viewport  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								0c24fe276c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master_164' into viewport_164  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_widgets.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								36435b43c7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master_164'  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								48db5713d6 
								
							
								 
							
						 
						
							
							
								
								Version 1.64  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								38cfcf9fbc 
								
							
								 
							
						 
						
							
							
								
								Tweak comments and indexes  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								c83391262e 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								00262d51ad 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								d7c04ccbfb 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								b1f263b34b 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								a58e4dfd0f 
								
							
								 
							
						 
						
							
							
								
								Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								8a216fe756 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								fd2bfb7e07 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								064b949bc2 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								2a0d26e603 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								df37a156e8 
								
							
								 
							
						 
						
							
							
								
								Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index ( #2036 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								18d6490dbd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master_164' into viewport_164  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)