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)  
				
					
						
							
							
								 
						
							
							
								5ddf60d8ce 
								
							
								 
							
						 
						
							
							
								
								Commit to facilitate branches merges  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								a06eb83359 
								
							
								 
							
						 
						
							
							
								
								Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. ( #3259 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								0fe5170bc4 
								
							
								 
							
						 
						
							
							
								
								Viewports: Report minimized viewports as zero DisplaySize to be consistent with main branch + comments ( #1542 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								6b688561aa 
								
							
								 
							
						 
						
							
							
								
								CI: Test building without C++ runtime on GCC/Clang.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								bb2529dd48 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL: Report a zero display-size when window is minimized, consistent with other backends.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								a056603d8b 
								
							
								 
							
						 
						
							
							
								
								Backends: Vulkan: Rename internal helper ImGui_ImplVulkanH_CreateWindow to ImGui_ImplVulkanH_CreateOrResizeWindow  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								9c209d5a90 
								
							
								 
							
						 
						
							
							
								
								Minor amend 9028088 ( #3261 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								43f79aa210 
								
							
								 
							
						 
						
							
							
								
								Backends: OSX: import the glfw workaround to avoid missing mouse clicks. ( #3261 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								39d17ca07f 
								
							
								 
							
						 
						
							
							
								
								Examples: Apple: catch events from the right and other mouse buttons when using Cocoa. ( #3260 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								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)  
				
					
						
							
							
								 
						
							
							
								c8cde28cf3 
								
							
								 
							
						 
						
							
							
								
								IO: AddInputCharacters function ignore 0 input. ( #3252 )  
							
							... 
							
							
 
							
							Amend ef13d954c8ea0a01#2541 , #2538 , #2815 ) 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								f44962c01a 
								
									
								
							
								 
							
						 
						
							
							
								
								Backends: Allegro: Don't call AddInputCharacter if the pressed key has no character. ( #3252 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								75bbbda645 
								
							
								 
							
						 
						
							
							
								
								Examples: Update comments to get SDL2 package with msys2's pacman ( #3251 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								615e9ae345 
								
							
								 
							
						 
						
							
							
								
								Docking: Fix undocking ( #3243 ), amend  7b3d3798 ( #1738 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								417ac68f82 
								
							
								 
							
						 
						
							
							
								
								Internals: AddPolyline: Add spaces for consistency, renaming.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								3b3af6b731 
								
							
								 
							
						 
						
							
							
								
								Docking: Fix extraneous function declaration ( #3236 ) + moved some other declarations in imgui_internal to facilitate moving docking code.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								e4d8267188 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								39c978f499 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix typo/bug introduced by  0679e056 ( #3231 ,  #3209 ,  #1829 ,  #946 ,  #413 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								1cd32d3afe 
								
							
								 
							
						 
						
							
							
								
								Docking: moving small docking context to imgui_internal.h, removed unnecessary indirection, renaming.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								476daf9aac 
								
							
								 
							
						 
						
							
							
								
								Settings: Added ReadInitFn pre-load handler.  
							
							... 
							
							
 
							
							(docking branch already has it, so it'll probably conflict with same contents) 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								5fdfa32cce 
								
							
								 
							
						 
						
							
							
								
								Update README.md  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								03ea87ea28 
								
							
								 
							
						 
						
							
							
								
								Backends, Win32: Request monitor update when dpi awarness is enabled to make sure they have the correct dpi settings.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								6b80bd9cc3 
								
							
								 
							
						 
						
							
							
								
								Fix GetGlyphRangesKorean() end-range to end at 0xD7A3 (instead of 0xD79D). ( #348 ,  #3217 )  
							
							... 
							
							
 
							
							https://en.wikipedia.org/wiki/Hangul_Syllables  
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								c46b79846c 
								
							
								 
							
						 
						
							
							
								
								Metrics: Fix metrics crash with viewports.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								6636cb9f2f 
								
							
								 
							
						 
						
							
							
								
								Viewports: Don't set ImGuiViewportFlags_NoRendererClear when ImGuiWindowFlags_NoBackground is set. ( #3213 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								a6f4b0fd70 
								
							
								 
							
						 
						
							
							
								
								Nav, Menus: Fix vertical wrap-around in menus or popups created with multiple appending calls to  BeginMenu()/EndMenu() or BeginPopup/EndPopup(). ( #3223 ,  #1207 )  
							
							... 
							
							
 
							
							First call to EndPopup() called NavRequestTryWrapWindow() which performed wrap-around operation while we were not done composing menu. This resulted in navigation wrapping around to first item.
Since wrap-around operation is only valid in last call to EndPopup() and there is no way to know which call is last - this operation is delayed to the end of the frame. 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								7b3d379819 
								
							
								 
							
						 
						
							
							
								
								FocusWindow(NULL) correctly steal active id from previous window. ( #1738 ) amend  b0a9bbf6 
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								685ca27d84 
								
							
								 
							
						 
						
							
							
								
								Backends: OpenGL: On OSX, if unspecified by app, made default GLSL version 150. ( #3199 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								1e7672acf4 
								
							
								 
							
						 
						
							
							
								
								Backends: DX12: Fixed OBJECT_DELETED_WHILE_STILL_IN_USE on viewport resizing. ( #3210 )  
							
							... 
							
							
 
							
							Tested with detaching/attaching a viewport and resizing it. DX12 debug
layer is clean. 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								8596f2b0fc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								4f33dd15c4 
								
							
								 
							
						 
						
							
							
								
								Internals: stand-in for large branches to facilitate merging.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								5f752a5ba9 
								
							
								 
							
						 
						
							
							
								
								Internals: shuffling some sections (2)  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								f466cfc2ca 
								
							
								 
							
						 
						
							
							
								
								Internals: shuffling some sections, added index.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								3aa1684129 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								538d28e29e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								c0d5b3f55a 
								
							
								 
							
						 
						
							
							
								
								Fix to facilitate branch merges  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								53ebd6a02f 
								
							
								 
							
						 
						
							
							
								
								Metrics: Added Table settings block.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								574ff0a280 
								
							
								 
							
						 
						
							
							
								
								Docking, Settings: Allow reload of settings data at runtime. ( #2573 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								51e568f9dc 
								
							
								 
							
						 
						
							
							
								
								Docking: Fix to allow basic reload of non-docking .ini data (following  d33021d8) + moved settings blocks  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								582f4db59b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								d33021d828 
								
							
								 
							
						 
						
							
							
								
								Settings: Made it possible to load window .ini data mid-frame. Added clear and post-read handlers. ( #2573 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								b6a04d7750 
								
							
								 
							
						 
						
							
							
								
								Settings: Added Clear Settings in Metrics. ( #2188 ) + Preserve last loaded copy in internal buffer used for save (so it can be browsed easily).  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								9ee442d3f0 
								
							
								 
							
						 
						
							
							
								
								Metrics: Added a "Settings" section with some details about persistent ini settings. InputText: Assert early on null buffer.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								510f301c9f 
								
							
								 
							
						 
						
							
							
								
								Internals: Removed seemingly unnecessary size_on_first_use arg to CreateNewWindow(), extracted code into ApplyWindowSettings.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								0679e05677 
								
							
								 
							
						 
						
							
							
								
								Internals: Added code in TempInputScalar() to clamp values, NOT used by stock Drag/Float ( #3209 ,  #1829 ,  #946 ,  #413 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								673d6df85f 
								
							
								 
							
						 
						
							
							
								
								Demo: Clamping font scale. Added helpers in demo. Comments. Update sponsors. ( #3206 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								f152fac4f1 
								
							
								 
							
						 
						
							
							
								
								Demo: Wrapped many (not all) code and comments lines to 120 characters to fit below GitHub viewer limit. ( #3193 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								419f905f91 
								
							
								 
							
						 
						
							
							
								
								Demo: Extracted some code out of ShowStyleEditor() into NodeFont().  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								11a3e75f47 
								
							
								 
							
						 
						
							
							
								
								Backends: Win32: Fix _WIN32_WINNT < 0x0600 (MinGW defaults to 0x502 == Windows 2003). ( #3183 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)