ocornut
							
						 | 
						
							
							
							
							
								
							
								2665288b30
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into docking
							
							
							
							
							
							
							
							# Conflicts:
#	imgui.cpp 
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								a933cc4f4d
								
							
								
							
						 | 
						
							
							
								
								Documentation update
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								64d8d302fb
								
							
								
							
						 | 
						
							
							
								
								ImDrawList: Fixed VtxOffset change leading to unnecessary leading empty ImDrawCmd in certain cases.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								16da8e6da6
								
							
								
							
						 | 
						
							
							
								
								Revert "Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). (#125)"
							
							
							
							
							
							
							
							This reverts commit 9b3ce494fd. 
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								53f0f97273
								
							
								
							
						 | 
						
							
							
								
								Added FAQ entry about DPI. Added Japanese font loading example.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								40b799023b
								
							
								
							
						 | 
						
							
							
								
								Docs: Update fonts.md (#2861) + update all references to FONTS.txt
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								Scott
							
						 | 
						
							
							
							
							
								
							
								a72754886f
								
							
								
							
						 | 
						
							
							
								
								Docs: Initial draft of fonts documentation (#2861)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								9b3ce494fd
								
							
								
							
						 | 
						
							
							
								
								Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). (#125)
							
							
							
							
							
							
							
							This change benefits Columns but was primarily made with Tables in mind. 
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								84862ec78e
								
							
								
							
						 | 
						
							
							
								
								ImDrawList, ImDrawListSplitter, Columns: Fixed an issue where changing channels with different TextureId, VtxOffset would incorrectly apply new settings to draw channels. (#3129, #3163)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								3bef743df4
								
							
								
							
						 | 
						
							
							
								
								ImDrawList: Clarifying and guarateeing that CmdBuffer.back()->UserCallback should be always be NULL.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								b1f2eacdf3
								
							
								
							
						 | 
						
							
							
								
								ImDrawList: Prefixed internal functions with underscore, renamed UpdateClipRect() to _OnChangedClipRect(), UpdateTextureID() -> _OnChangedTextureID()
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								e35a813d57
								
							
								
							
						 | 
						
							
							
								
								ImDrawList: Separating PrimXXX sections from more internals helper in the header file.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								117d57df5b
								
							
								
							
						 | 
						
							
							
								
								ImDrawList: Additional comments and extracted bits into ImDrawList::PopUnusedDrawCmd()
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								a6bb047bab
								
							
								
							
						 | 
						
							
							
								
								ImDrawList: Store header/current ImDrawCmd in instance to simplify merging code. Amend 0320e72, toward #3163, #3129
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								57191fe3d0
								
							
								
							
						 | 
						
							
							
								
								Comments about limiting WindowRounding to a reasonable size.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								f6120f8e16
								
							
								
							
						 | 
						
							
							
								
								ImDrawList, ImDrawListSplitter, Columns: Fixed an issue where starting a split when current VtxOffset was not zero would lead to draw commands with wrong VtxOffset. (#259
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								41f47c853b
								
							
								
							
						 | 
						
							
							
								
								ImDrawList: Amend 0320e72 removed an unnecessary test.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								8baa4ccff5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into docking
							
							
							
							
							
							
							
							# Conflicts:
#	imgui.cpp 
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								0320e7257b
								
							
								
							
						 | 
						
							
							
								
								ImDrawList: Small refactor to create empty command when beginning the frame, allowing to simplify some functions.
							
							
							
							
							
							
							
							+ Missing clearing two fields in ClearFreeMemory() (was hamrless) 
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								003153b3ac
								
							
								
							
						 | 
						
							
							
								
								ImDrawList: Tweaks to make style consistent (using pointers, same local names). Added comments. Should be no-op.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								thedmd
							
						 | 
						
							
							
							
							
								
							
								e22e3f300a
								
							
								
							
						 | 
						
							
							
								
								ImDrawList: Fixed an issue when draw command merging or cancelling while crossing the VtxOffset boundary would lead to draw command being emitted with wrong VtxOffset value.  (#3129, #3163, #3232)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								78d5ccfb90
								
							
								
							
						 | 
						
							
							
								
								ImDrawList: PushColumnsBackground(): Fixed incorrect assert. (#3163)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								Rokas Kupstys
							
						 | 
						
							
							
							
							
								
							
								5af8a8c7e8
								
							
								
							
						 | 
						
							
							
								
								CI: Extra warnings for builds with Clang. Backends: OpenGL3: Fix sign conversion warnings.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								Rokas Kupstys
							
						 | 
						
							
							
							
							
								
							
								dc49b14e29
								
							
								
							
						 | 
						
							
							
								
								Misc: Fix examples of using other OpenGL3 bindings in Makefiles.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								Mark Jansen
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6eb66fbef3
								
									
								
							
								
							
						 | 
						
							
							
								
								Backends: Win32: Cache the result of a windows version check. (#3283)
							
							
							
							
							
							
							
							This is not expected to change while the application is running :) 
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								79fbab543d
								
							
								
							
						 | 
						
							
							
								
								Minor fix to avoid undefined behavior sanitizer triggering (#3276)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								53dfccbe4b
								
							
								
							
						 | 
						
							
							
								
								imgui_freetype: Fix for rare case where FT_Get_Char_Index() succeed but FT_Load_Glyph() fails. (#618)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
								
								
							
							
								
							
								5e976e9b05
								
									
								
							
								
							
						 | 
						
							
							
								
								Title capitalization (#3280)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=5 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								41e8837f59
								
							
								
							
						 | 
						
							
							
								
								Comments, adding some spacing in ImVec2() constructors.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								Giovanni Funchal
							
						 | 
						
							
							
							
							
								
							
								3f26a07ee1
								
							
								
							
						 | 
						
							
							
								
								Backends: OpenGL: Fixed loader auto-detection to not interfere with ES2/ES3 defines. (#3246)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								5d472c4895
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into docking + fixes for #3259
							
							
							
							
							
							
							
							# Conflicts:
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp 
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								5ddf60d8ce
								
							
								
							
						 | 
						
							
							
								
								Commit to facilitate branches merges
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								a06eb83359
								
							
								
							
						 | 
						
							
							
								
								Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. (#3259)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								0fe5170bc4
								
							
								
							
						 | 
						
							
							
								
								Viewports: Report minimized viewports as zero DisplaySize to be consistent with main branch + comments (#1542)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								Rokas Kupstys
							
						 | 
						
							
							
							
							
								
							
								6b688561aa
								
							
								
							
						 | 
						
							
							
								
								CI: Test building without C++ runtime on GCC/Clang.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								bb2529dd48
								
							
								
							
						 | 
						
							
							
								
								Backends: SDL: Report a zero display-size when window is minimized, consistent with other backends.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								a056603d8b
								
							
								
							
						 | 
						
							
							
								
								Backends: Vulkan: Rename internal helper ImGui_ImplVulkanH_CreateWindow to ImGui_ImplVulkanH_CreateOrResizeWindow
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								9c209d5a90
								
							
								
							
						 | 
						
							
							
								
								Minor amend 9028088 (#3261)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								Nicolas Burrus
							
						 | 
						
							
							
							
							
								
							
								43f79aa210
								
							
								
							
						 | 
						
							
							
								
								Backends: OSX: import the glfw workaround to avoid missing mouse clicks. (#3261)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								Nicolas Burrus
							
						 | 
						
							
							
							
							
								
							
								39d17ca07f
								
							
								
							
						 | 
						
							
							
								
								Examples: Apple: catch events from the right and other mouse buttons when using Cocoa. (#3260)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								d29157ce58
								
							
								
							
						 | 
						
							
							
								
								Moved static array with non-trivial constructors outside of function seems to remove requirement of linking with libstdc++ on some compilers.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								c8cde28cf3
								
							
								
							
						 | 
						
							
							
								
								IO: AddInputCharacters function ignore 0 input. (#3252)
							
							
							
							
							
							
							
							Amend ef13d954 + c8ea0a01 (#2541, #2538, #2815) 
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								Espyo
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f44962c01a
								
									
								
							
								
							
						 | 
						
							
							
								
								Backends: Allegro: Don't call AddInputCharacter if the pressed key has no character. (#3252)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								75bbbda645
								
							
								
							
						 | 
						
							
							
								
								Examples: Update comments to get SDL2 package with msys2's pacman (#3251)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								615e9ae345
								
							
								
							
						 | 
						
							
							
								
								Docking: Fix undocking (#3243), amend 7b3d3798 (#1738)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								417ac68f82
								
							
								
							
						 | 
						
							
							
								
								Internals: AddPolyline: Add spaces for consistency, renaming.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								3b3af6b731
								
							
								
							
						 | 
						
							
							
								
								Docking: Fix extraneous function declaration (#3236) + moved some other declarations in imgui_internal to facilitate moving docking code.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								e4d8267188
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into docking
							
							
							
							
							
							
							
							# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp 
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								Mr. Metric
							
						 | 
						
							
							
							
								
								
							
							
								
							
								39c978f499
								
									
								
							
								
							
						 | 
						
							
							
								
								Fix typo/bug introduced by 0679e056 (#3231, #3209, #1829, #946, #413)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								1cd32d3afe
								
							
								
							
						 | 
						
							
							
								
								Docking: moving small docking context to imgui_internal.h, removed unnecessary indirection, renaming.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=6 years) |