omar
							
						 
						
							 
							
							
							
								
							
								a82be53407 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'docking2' into viewport_docking  
							
							 
							
							... 
							
							
 
							
							# Conflicts:
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								49533bc86e 
								
							
								 
							
						 
						
							
							
								
								Examples: Enabled Docking + Nav by default in the branch. ( #351 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								e381f22ac1 
								
							
								 
							
						 
						
							
							
								
								Docking: Added Docking system. (Part 3) ( #351 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								9ac1e93aa1 
								
							
								 
							
						 
						
							
							
								
								Docking: Added Docking system. (Part 2) ( #351 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								bd5b38e232 
								
							
								 
							
						 
						
							
							
								
								Docking: Added Docking system. Enable with io.ConfigFlags |= ImGuiConfigFlags_DockingEnable. (Part 1) ( #351 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								5adcb9ce6d 
								
							
								 
							
						 
						
							
							
								
								Docking: Added empty skeleton/sections to facilitate diff/patch of incoming code (otherwise git gives us a messier patch).  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								2ec135c9f7 
								
							
								 
							
						 
						
							
							
								
								Docking: Added ImVec2[] non const operator. Added ImStrSkipBlank. Reseting some values earlier in Begin. Added IMGUI_DEBUG_LOG() helper. Added docking source code section.  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								58d46e1fe6 
								
							
								 
							
						 
						
							
							
								
								Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. ( #261 ,  #351 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								c039a77d21 
								
							
								 
							
						 
						
							
							
								
								Internals: Added ImPool helper structure. Moved ImVec1f.  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								741bdf151a 
								
							
								 
							
						 
						
							
							
								
								Added ImGuiWindowFlags_UnsavedDocument flags.  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								5070c769b8 
								
							
								 
							
						 
						
							
							
								
								Internals: Windows hidden with HiddenFramesRegular (but NOT HiddenFramesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								52e0de84a9 
								
							
								 
							
						 
						
							
							
								
								Internals: Split RenderTextClipped into two functions.  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								eb7033e75b 
								
							
								 
							
						 
						
							
							
								
								Version 1.66 WIP  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								b974fffea0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							 
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								e0cab5664a 
								
							
								 
							
						 
						
							
							
								
								Version 1.65  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								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)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								a2616c79fe 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							 
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								e58bc3d5b7 
								
							
								 
							
						 
						
							
							
								
								Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. ( #2036 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								0b18c11440 
								
							
								 
							
						 
						
							
							
								
								Refactor: Moved ImFile functions. ( #2036 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								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)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								31b5b18611 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							 
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								bb3184af74 
								
							
								 
							
						 
						
							
							
								
								Refactor: moved low-layout helpers to imgui_widgets.cpp (Spacing, Dummy, NewLine, Separator, etc.) ( #2036 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								cbdce80837 
								
							
								 
							
						 
						
							
							
								
								Internals: Refactor: Moved render functions to their own section. ( #2036 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								8601c39571 
								
							
								 
							
						 
						
							
							
								
								Viewport: Making the code a little more sturdy (flag changes) + added descriptions. ( #1542 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								af27ec296b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags  
							
							 
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui.h 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								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)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								77ba883f23 
								
							
								 
							
						 
						
							
							
								
								Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. ( #1427 ) + changed ImGuiIO layout.  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								bbcc976739 
								
							
								 
							
						 
						
							
							
								
								Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								b944aa623c 
								
							
								 
							
						 
						
							
							
								
								Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								a848807847 
								
							
								 
							
						 
						
							
							
								
								Minor inconsequential merges from Master/Docking branches  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								bdb30d7145 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								897e5c6231 
								
							
								 
							
						 
						
							
							
								
								Viewport: Moved code following refactor.  ( #2036 ,  #1542 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								40db2ca098 
								
							
								 
							
						 
						
							
							
								
								Fixed a build issue with non-Cygwin GCC under Windows.  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								5451cb7e1e 
								
							
								 
							
						 
						
							
							
								
								Readme, Changelog ( #2059 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								1007873d94 
								
							
								 
							
						 
						
							
							
								
								Misc: merge minor/inconsequential stuff from Docking branch to reduce drift.  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								Jiří Šebele
							
						 
						
							 
							
							
							
								
							
								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)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								d07f494305 
								
							
								 
							
						 
						
							
							
								
								Internals: Exposed SliderBehaviorT, DragBehaviorT, RoundScalarWithFormatT, SliderCalcRatioFromValueT. ( #2036 )  
							
							 
							
							... 
							
							
 
							
							Renamed RoundScalarWithFormat -> RoundScalarWithFormatT.
Renamed SliderBehaviorCalcRatioFromValue -> SliderCalcRatioFromValueT 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								bcb1441ce7 
								
							
								 
							
						 
						
							
							
								
								Version 1.65 WIP  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								fd201a90f1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							 
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								767649afb1 
								
							
								 
							
						 
						
							
							
								
								Fix missing include on some systems to use intptr_t. ( #2036 ,  #2054 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								5d40d295b3 
								
							
								 
							
						 
						
							
							
								
								Comments, readme updates  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								Omar Cornut
							
						 
						
							 
							
							
							
								
							
								be6ea86f8d 
								
							
								 
							
						 
						
							
							
								
								OSX: Added imgui_widgets.cpp to xcode project files.  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								a52ce7ac8b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								fd90afef43 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) ( #2036 ,  #1542 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								5207afa0dd 
								
							
								 
							
						 
						
							
							
								
								Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) ( #2036 ,  #1542 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								9174958b43 
								
							
								 
							
						 
						
							
							
								
								imgui_stl: Comments ( #2035 )  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								0699310b9c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'viewport_164' into viewport  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								0c24fe276c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master_164' into viewport_164  
							
							 
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_widgets.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								36435b43c7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master_164'  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
						
					 
				
					
						
							
							
								 
								omar
							
						 
						
							 
							
							
							
								
							
								48db5713d6 
								
							
								 
							
						 
						
							
							
								
								Version 1.64  
							
							 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)