4078abe14c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
#	imgui.h 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								702626dd8a 
								
							
								 
							
						 
						
							
							
								
								Docking: storing window menu handler in a function pointer to allow customizing menu (undocumented)  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								66b762577c 
								
							
								 
							
						 
						
							
							
								
								Backends: OpenGL3: Fixed restoration of a potentially deleted OpenGL program. ( #6220 ,  #6224 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								bfce7750b1 
								
							
								 
							
						 
						
							
							
								
								Simpified code in GetKeyData() and used ImGuiKey_KeysData_OFFSET for consistency. Rework demo, Comments. Moved ImGuiKey_KeysData_OFFSET to internal.h ( #4921 ,  #6191 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								2496b973f9 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL2,SDL3: Accept SDL_GetPerformanceCounter() not returning a monotonically increasing value. ( #6189 ,  #6114 ,  #3644 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								e9743d85dd 
								
							
								 
							
						 
						
							
							
								
								Drag and Drop: Clear state on EndDragDropTarget() with delivery + fixed handling of overlapping targets when smaller one is submitted before and can accept the same data type. ( #6183 ,  #5817 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								2ee77aa6be 
								
									
								
							
								 
							
						 
						
							
							
								
								Missing closing parenthesis in debug popup log ( #6177 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								696a533532 
								
							
								 
							
						 
						
							
							
								
								TestEngine: added ImGuiItemStatusFlags_Inputable flag report to facilitate fuzzing.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								752603bc70 
								
							
								 
							
						 
						
							
							
								
								Fixed imgui_single_file.h for IMGUI_DEFINE_MATH_OPERATORS change. ( #6164 ,  #6137 ,  #5966 ,  #2832 )  
							
							... 
							
							
 
							
							Amend a1b8457 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								a1b8457cb5 
								
							
								 
							
						 
						
							
							
								
								Moved the optional "courtesy maths operators" (#define IMGUI_DEFINE_MATH_OPERATORS) implementation from imgui_internal.h in imgui.h. ( #6164 ,  #6137 ,  #5966 ,  #2832 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								e25e4526cd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								5d74891285 
								
							
								 
							
						 
						
							
							
								
								Backends: Win32: Use WM_NCMOUSEMOVE / WM_NCMOUSELEAVE to track mouse positions over non-client area (OS decorations) when app is not focused. ( #6045 ,  #6162 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								4f630b0449 
								
							
								 
							
						 
						
							
							
								
								imgui_freetype: fixed non-ASCII characters in sources. ( #6166 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								204cb4d226 
								
							
								 
							
						 
						
							
							
								
								Version 1.89.4 WIP  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								192196711a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	docs/CHANGELOG.txt 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								458a109031 
								
							
								 
							
						 
						
							
							
								
								Version 1.89.3  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								b0c1816664 
								
							
								 
							
						 
						
							
							
								
								Backends: OpenGL3: Fixed loader compatibility with GL_VERSION for GL 2.x ( #6154 ,  #4445 ,  #3530 )  
							
							... 
							
							
 
							
							GL_MAJOR_VERSION and GL_MINOR_VERSION are available on GL 3.0 and above.
So we have to parse GL_VERSION under GL 2.x
Reference https://www.khronos.org/opengl/wiki/OpenGL_Context#Context_information_queries 
Regressed since 459de65477https://github.com/ocornut/imgui/pull/3530  
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								fa0852f9e5 
								
							
								 
							
						 
						
							
							
								
								ColorEdit, ColorPicker: Fixed hue/saturation preservation logic from interfering with the displayed value (but not stored value) of others widgets instances. ( #6155 )  
							
							... 
							
							
 
							
							Amend 30546bc0accb0261b38d22bc4 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								092b6825ac 
								
							
								 
							
						 
						
							
							
								
								Fonts: Assert that in each GlyphRanges[] pairs first is <= second.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								345184330b 
								
							
								 
							
						 
						
							
							
								
								Internals: Settings: amend ClearWindowSettings() for Docking.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								ea4565368e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl2.h
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_sdl3.h
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								f0ac68ad35 
								
							
								 
							
						 
						
							
							
								
								Internal: Settings: amend  0b86513 revert to use FindWindowSettingsByID().  
							
							... 
							
							
 
							
							Namely for docking system. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								082b20e46b 
								
							
								 
							
						 
						
							
							
								
								Internals: Settings: added ClearWindowSettings(). Extract part of CreateNewWindow() into InitOrLoadWindowSettings().  
							
							... 
							
							
 
							
							Designed to that if the window reappear in the session it won't take an additional slot. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								b2ebd03b16 
								
							
								 
							
						 
						
							
							
								
								Internals: Settings: moved Windows setting to their sub-section.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								0b865136e3 
								
							
								 
							
						 
						
							
							
								
								Internals: Settings: Added FindWindowSettingsByName() (replacing old version by ID) FindWindowSettingsByWindow() + remove unnecessary FindOrCreateWindowSettings().  
							
							... 
							
							
 
							
							In 1 code path we do a redundant hash but this happens only once per window per session so we are ok. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								0d7d877cb5 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL3: Update for latest.  
							
							... 
							
							
 
							
							Note that resizing secondary viewports seems broken. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								99c0bd65df 
								
							
								 
							
						 
						
							
							
								
								Added SeparatorText() widget. ( #1643 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								85395b76b0 
								
							
								 
							
						 
						
							
							
								
								CI: Update versions.  
							
							... 
							
							
 
							
							Backends: GLFW: Warning fix under Linux. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								fac19e1883 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL2:+SDL3 Implement SetPlatformImeDataFn (amends). ( #6071 ,  #1953 ) + fix SDL3 setting PlatformHandleRaw. ( #6146 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								734c6af187 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL2: Implement SetPlatformImeDataFn. ( #6071 ,  #1953 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								95412ad3a5 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL3: Removed unnecessary #ifdef.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								a526ff8c30 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL3: Added multi-viewports support. ( #6146 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								e4233c6fb6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)  
							
							... 
							
							
 
							
							# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx10.h
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx11.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx12.h
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_dx9.h
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_metal.h
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_opengl3.h
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdlrenderer.cpp
#	backends/imgui_impl_sdlrenderer.h
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_widgets.cpp 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								13fbd99491 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL3: update to run with SDL3. Examples: Add SDL3+Gl example. Remove some version checks. ( #6146 )  
							
							... 
							
							
 
							
							More update upcoming in docking branch. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								d9bf80f655 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL3: copied imgui_impl_sdl2 into imgui_impl_sdl3 and ONLY replaced strings (1/2). ( #6146 )  
							
							... 
							
							
 
							
							NO OTHER CHANGES. This WILL NOT compile with SDL3.
This intermediate commit designed to make it easier to visualize the meaningful channges commit in the next commit. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								e816bc6723 
								
							
								 
							
						 
						
							
							
								
								Merge misc changes from docking branch to reduce small drift.  
							
							... 
							
							
 
							
							In particular:
- imgui.cpp : move UpdateInputEvents() higher in NewFrame() to match docking + update RenderMouseCursor() to match.
- imgui_draw.cpp: ImDrawList::_ResetForNewFrame() change from c807192ab 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								1b27ac982f 
								
							
								 
							
						 
						
							
							
								
								Backends+Examples: SDL2: renamed imgui_impl_sdl.cpp/.h to imgui_impl_sdl2.cpp/.h. ( #6146 )  
							
							... 
							
							
 
							
							+ CI: Update Windows CI to update SDL 2.26.3 instead of 2.0.10 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								c807192abc 
								
							
								 
							
						 
						
							
							
								
								Tables: amend  f799a29 with a better solution + fix potential overflow  ( #6140 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								d6ea56dfd9 
								
							
								 
							
						 
						
							
							
								
								Tables: amend  f799a29 with a better solution + fix potential overflow  ( #6140 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								ea39841fcd 
								
							
								 
							
						 
						
							
							
								
								Examples: (Again, but better) made SDL+GL and GLFW+GL examples build with Emscripten. ( #2492 ,  #2494 ,  #3699 ,  #3705 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								b0a936e5d4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking (incl revert of examples refactor)  
							
							... 
							
							
 
							
							# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_directx11/main.cpp
#	examples/example_sdl_opengl2/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
#	examples/example_win32_directx9/main.cpp 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								97a1f761c6 
								
							
								 
							
						 
						
							
							
								
								Examples: (Again, but better) made SDL+GL and GLFW+GL examples build with Emscripten. ( #2492 ,  #2494 ,  #3699 ,  #3705 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								f43c6ea6a4 
								
							
								 
							
						 
						
							
							
								
								Revert most of "Examples: refactor all examples with a MainLoopStep() function..." ( #2492 ,  #3699 )"  
							
							... 
							
							
 
							
							This reverts commit 96ab68eee0 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								f799a293c8 
								
							
								 
							
						 
						
							
							
								
								Tables: Solved an ID conflict issue with multiple-instances of a same table. Storing instance id for convenience. ( #6140 )  
							
							... 
							
							
 
							
							TableGetColumnResizeID() are still using an incorrect table, but having only one-level left tends to cancel things out. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								c75410e72c 
								
									
								
							
								 
							
						 
						
							
							
								
								Debug: fix display order of InputText's data CurLenA/CurLenW ( #6143 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								a085581057 
								
							
								 
							
						 
						
							
							
								
								Backends: GLFW: added ImGui_ImplGlfw_SetCallbacksChainForAllWindows(). ( #6142 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								265b88273e 
								
							
								 
							
						 
						
							
							
								
								Backends: Fixed pragma warning with old GCC.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								d0b1aaa076 
								
							
								 
							
						 
						
							
							
								
								Backends: GLFW: Registering custom low-level mouse wheel handler to get more accurate scrolling impulses on Emscripten. ( #4019 ,  #6096 )  
							
							... 
							
							
 
							
							Namely, GLFW JS emulation seems to quantize values to a min of -1/+1 which breaks modern OSX/Windows emulating smoothness with stepping wheels (slow steps are sending sub-1.0 values)
+ Massage changelog. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								6584de4a78 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL: Avoid calling SDL_SetCursor() when cursor has not changed. ( #6113 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								5ebb6a2954 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp 
							
						 
						
							ago%!(EXTRA string=3 years)