105f3b14e4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into styles  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								564c97b87e 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								f0f86213db 
								
							
								 
							
						 
						
							
							
								
								ImVector: added resize() variant with initialization value  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								b409d399c8 
								
							
								 
							
						 
						
							
							
								
								Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								9693fd5351 
								
							
								 
							
						 
						
							
							
								
								PushStyleVar/PopStyleVar: internal tweaks  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								7c9e38f60a 
								
							
								 
							
						 
						
							
							
								
								Style: Moving code in a function to make incoming diff easier to parse.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								709653c330 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into styles  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								6c91a1ef7f 
								
							
								 
							
						 
						
							
							
								
								Minor comments  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								2aa9a538c0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1323  from waywardmonkeys/remove-commas-at-end-of-list  
							
							... 
							
							
 
							
							Remove commas after last item in enumeration to stay compatible with older compilers. 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								c4c042bcec 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								052999a6ab 
								
							
								 
							
						 
						
							
							
								
								More consistently uses "Dear ImGui"  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								83645aa593 
								
							
								 
							
						 
						
							
							
								
								More consistently uses "Dear ImGui"  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								2fcdeb7f12 
								
							
								 
							
						 
						
							
							
								
								Remove commas after last item in enumeration.  
							
							... 
							
							
 
							
							This brings these enums to match the rest of the code and fixes
2 warnings under clang about using C++11 extensions. 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								4c794be41d 
								
							
								 
							
						 
						
							
							
								
								Improve warning configuration for clang.  
							
							... 
							
							
 
							
							Clang 4.0 introduced -Wdouble-promotion, so check for and disable
that on clang as we do on gcc.
The old style casts warning is already disabled globally in this file
for clang, so it doesn't need to be re-disabled within this scope. 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								54d30d758f 
								
							
								 
							
						 
						
							
							
								
								Implicit "Debug" window uses a "Debug##Default" identifier to allow the user creating such window with custom flags  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								65632d2682 
								
							
								 
							
						 
						
							
							
								
								Fixed alloca include for SunOS ( #1319 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								3420080a35 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1319  from RyuKojiro/more_portable_alloca_include-ocornut  
							
							... 
							
							
 
							
							Simplify alloca.h include condition (fix for NetBSD) 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								cf6ba9dd2d 
								
							
								 
							
						 
						
							
							
								
								Don't do a bunch of OS gymnastics. alloca.h is only for glibc, everyone else uses stdlib.h  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								66a9d4856c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into navigation  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								cb2775ae54 
								
							
								 
							
						 
						
							
							
								
								Internals: ImGuiItemFlags comments  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								62d7fa4324 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into navigation  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								f63c03c464 
								
							
								 
							
						 
						
							
							
								
								Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								51fcef0c21 
								
							
								 
							
						 
						
							
							
								
								BeginCombo() tweaks, merged from Navigation branch.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								38ed66f55e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into navigation  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui_demo.cpp 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								9e2f202f05 
								
							
								 
							
						 
						
							
							
								
								Demo: Not using the undesirable Begin() overload.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								5c4fda0fbc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into navigation  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								2169bf6895 
								
							
								 
							
						 
						
							
							
								
								Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). ( #1317 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								790605e359 
								
							
								 
							
						 
						
							
							
								
								Minor comments + renaming internal fields  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								8971d70149 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1313  from thevaber/master  
							
							... 
							
							
 
							
							Improved ColorPicker hue wheel color interpolation 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								e1a7aa41cb 
								
							
								 
							
						 
						
							
							
								
								Improved ColorPicker hue wheel color interpolation  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								2600b28f5d 
								
							
								 
							
						 
						
							
							
								
								Begin(): fixed calling Begin() more than once per frame setting `window_just_activated_by_user` which in turn would set Appearing to true for that frame.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								6400f2900a 
								
							
								 
							
						 
						
							
							
								
								Begin(): renamed locals.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								a9c6a0f6ec 
								
							
								 
							
						 
						
							
							
								
								Begin(): Removed unnecessary code (at the time of 1.18 commit  e9e0e36f98, CursorPos was used to compute SizeContentsFit and this was necessary)  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								89cae37b49 
								
							
								 
							
						 
						
							
							
								
								Begin(): Tidying up some code, should be a no-op.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								8fbe8709f9 
								
							
								 
							
						 
						
							
							
								
								TODO, minor tweak  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								e8dbf1c795 
								
							
								 
							
						 
						
							
							
								
								Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								5658675e9d 
								
							
								 
							
						 
						
							
							
								
								Combo: Removed unnecessary ClearActiveId() call (from era where active combo stored an id, now we just use popup functionality)  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								804ee78731 
								
							
								 
							
						 
						
							
							
								
								Added IsWindowAppearing().  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								fd684ba974 
								
							
								 
							
						 
						
							
							
								
								Removed 2 obsolete redirection functions (obsoleted 26+ months ago).  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								b8ade0b94f 
								
							
								 
							
						 
						
							
							
								
								Examples: Main: Removed call to SetNextWindowSize()  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								4abce8af58 
								
							
								 
							
						 
						
							
							
								
								Examples: GL2: Renaming, comments.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								5665f1d3e3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'nlguillemot-master'  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								d9016964ad 
								
							
								 
							
						 
						
							
							
								
								Examples: GL3: Comments, tweaks ( #1145 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								c47e5fc76a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/nlguillemot/imgui  into nlguillemot-master  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								7d1f2c0dc5 
								
							
								 
							
						 
						
							
							
								
								Examples: GL2: rename functions to include GL2 in name  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								d165817880 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1307  from JJscott/dev  
							
							... 
							
							
 
							
							Examples: OpenGL: Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes  #798  
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								cf48e28932 
								
							
								 
							
						 
						
							
							
								
								Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode.  closes   #798  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								670d40642f 
								
							
								 
							
						 
						
							
							
								
								Fixed C4267 conversion from size_t to int.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								6a1ba317c7 
								
							
								 
							
						 
						
							
							
								
								Demo: Minor coding style tweaks so bgfx copy needs less patching.  
							
							
 
							
						 
						
							ago%!(EXTRA string=8 years)  
				
					
						
							
							
								 
						
							
							
								1a62d46db5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into navigation  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=8 years)