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)  
				
					
						
							
							
								 
						
							
							
								46efed8b70 
								
							
								 
							
						 
						
							
							
								
								CI: Fix Emscripten build.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								1f1861dae6 
								
							
								 
							
						 
						
							
							
								
								Backends:  Added support for SDL 2.0.18+ preciseX/preciseY mouse wheel data for smooth scrolling + scaling for Emscripten. ( #4019 ,  #6096 )  
							
							... 
							
							
 
							
							+ Missing changelog entries. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								5386ddcd05 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	examples/example_emscripten_opengl3/main.cpp
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_glut_opengl2/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
#	imgui_demo.cpp 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								624c057ae1 
								
							
								 
							
						 
						
							
							
								
								Backends: GLFW: revert flipping mouse-wheel axis for Emscripten. ( #4019 )  
							
							... 
							
							
 
							
							Latest version seems ok. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								ce6e6da510 
								
							
								 
							
						 
						
							
							
								
								Examples: Made example_sdl_opengl3 and example_glfw_opengl3 build with Emscripten. Removed dedicated examples. ( #2492 ,  #2494 ,  #3699 ,  #3705 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								96ab68eee0 
								
							
								 
							
						 
						
							
							
								
								Examples: refactor all examples with a MainLoopStep() function, to facilitate use with Emscripten. ( #2492 ,  #3699 )  
							
							... 
							
							
 
							
							Aligned all examples. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								b51919dce1 
								
							
								 
							
						 
						
							
							
								
								Examples: Emscripten+GLFW: revert to use a shell_minimal.html closer to vanilla one, as our fullscreen + misc tweaks to Emscripten+SDL example to match other version.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								0370856d78 
								
							
								 
							
						 
						
							
							
								
								Backends: GLFW: Removed mouse-wheel value scaling for Emscripten. ( #4019 ,  #6096 ,  #6081 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								f822e07d76 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL: Removed SDL_MOUSEWHEEL value clamping. ( #4019 ,  #6096 ,  #6081 )  
							
							... 
							
							
 
							
							+ Fix warnings. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								887abe9578 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
#	imgui_widgets.cpp 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								3617a96372 
								
							
								 
							
						 
						
							
							
								
								Backends, Inputs: Made horizontal scroll wheel and horizontal scroll direction consistent accross backends/os. ( #4019 ,  #6096 ,  #1463 )  
							
							... 
							
							
 
							
							Documented assumptions. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								8d29665ae1 
								
							
								 
							
						 
						
							
							
								
								Backends: OSX: Fixed scroll wheel scaling for devices emitting events with hasPreciseScrollingDeltas==false (e.g. non-Apple mices).  
							
							... 
							
							
 
							
							Ref #4019  for details provided in .XLS sheet, although not strictly related to main issue topic.
+ Rename Emscripten demo titles to make SDL visible. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								2efebe3315 
								
							
								 
							
						 
						
							
							
								
								ShowFontAtlas, Demo: optionally use style text color for tint. ( #6129 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								5a3f82e2f4 
								
							
								 
							
						 
						
							
							
								
								Examples: SDL+SDL_Renderer: Added call to SDL_RenderSetScale() to display is correct on a Retina display (albeit lower-res as our other unmodified examples). ( #6121 ,  #6065 ,  #5931 ).  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								867bdbecb3 
								
							
								 
							
						 
						
							
							
								
								Text: fixed issue in RenderText() leading to IM_ASSERT_PARANOID() triggering if enabled. ( #6132 ,  #5720 ,  #5919 )  
							
							... 
							
							
 
							
							Amend 3482d4ecbd96f6e 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								d719776460 
								
							
								 
							
						 
						
							
							
								
								Internals: added 'ImGuiButtonFlags flags' to ImageButtonEx(). ( #6126 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								f142887088 
								
							
								 
							
						 
						
							
							
								
								Combo: Allow SetNextWindowSize() to alter combo popup size. ( #6130 )  
							
							... 
							
							
 
							
							Amend a5e939214 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								259560aa26 
								
							
								 
							
						 
						
							
							
								
								Demo: moved sections around in prevision for adding nicer separators.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								27f2dd56d6 
								
							
								 
							
						 
						
							
							
								
								Internals: move "%s" skip-formatting logic to ImFormatStringToTempBuffer() function, meaning Text() and all the *V() functions can also benefit from it. ( #3466 )  
							
							... 
							
							
 
							
							Amend 645a6e023a785a 
							
						 
						
							ago%!(EXTRA string=3 years)