530134d125 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								430c05991c 
								
							
								 
							
						 
						
							
							
								
								Docs: added more detailed information about UTF-8 encoding.  
							
							... 
							
							
 
							
							+ Revert mistakenly committed Win32+DX11 main.cpp from last commit. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								513af1efc9 
								
							
								 
							
						 
						
							
							
								
								Examples: Updated all Visual Studio project file to use /utf-8 option, so string literals are UTF-8 encoded by default.  
							
							... 
							
							
 
							
							(Not to misake with "Character Set" "Use Unicode Character Set" "Use Multi-Byte Character Set" which is a VS/Windows SDK thing but not a compiler-encoding thing.) 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								0397321be0 
								
							
								 
							
						 
						
							
							
								
								Debug Tools: Added 'io.ConfigDebugIgnoreFocusLoss' option. ( #4388 ,  #4921 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								6656553fa4 
								
							
								 
							
						 
						
							
							
								
								Nav: Record/restore preferred position on each given axis.  
							
							... 
							
							
 
							
							Tagging #6344  #6003  #2694  #1688  as it relates to scoring, however this doesn't technically fix any of them fully yet.
But e.g. once we restore axial path for #2694  this commit will allow going back and forth to initial location. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								39f7248d4a 
								
							
								 
							
						 
						
							
							
								
								Backends: OpenGL3: Add glBindSampler for GL ES 3.0. ( #6375 )  
							
							... 
							
							
 
							
							Amended given addition of GlProfileIsES3 in dd9db5e 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								dd9db5e889 
								
							
								 
							
						 
						
							
							
								
								Backends: OpenGL3: Added runtime flags for ES2/ES3 to simplify coding-style. ( #6375 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								6cdedf5834 
								
							
								 
							
						 
						
							
							
								
								Drag, Sliders: if the format string doesn't contain any %, when using CTRL+Click to input we use a default format. ( #6405 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								70cca1eac0 
								
									
								
							
								 
							
						 
						
							
							
								
								Backends: avoid null dereference in metal and osx shutdown ( #6385 ,  #6334 )  
							
							... 
							
							
 
							
							Co-authored-by: Alexander Rath <alex@ist.besonders.cool> 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								5dc6013713 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL3: Fixed build on Emscripten/iOS/Android. ( #6391 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								7c291ba31b 
								
							
								 
							
						 
						
							
							
								
								Tables: Fixed command merging when compiling with VS2013. ( #6377 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								085fa42b7d 
								
							
								 
							
						 
						
							
							
								
								Adedd workaround for GCC erroneous/zealous warning ( #5343 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								031e152d29 
								
							
								 
							
						 
						
							
							
								
								Examples: DX9, DX10, DX11: Queue framebuffer resize instead of processing in WM_SIZE. ( #6374 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								15da1a9abc 
								
							
								 
							
						 
						
							
							
								
								Fixed misleading local name ( #4493 ) + minor typo ( #6369 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								031148dc56 
								
							
								 
							
						 
						
							
							
								
								Fixed bad merge.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								fd943182bd 
								
							
								 
							
						 
						
							
							
								
								ImVec2: Added unary minus operator ( #6368 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								594cc4793a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	docs/CHANGELOG.txt 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								d3ad2f357f 
								
							
								 
							
						 
						
							
							
								
								Menus: Fixed an issue when opening a menu hierarchy in a given menu-bar would allow opening another via simple hovering. ( #3496 ,  #4797 )  
							
							... 
							
							
 
							
							Amend 48f26333 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								b47507951e 
								
							
								 
							
						 
						
							
							
								
								Nav: Fixed CTRL+Tab into a root window with only childs with _NavFlattened flags erroneously initializing default nav layer to menu layer.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								eed7b0e9c5 
								
							
								 
							
						 
						
							
							
								
								Nav: remove other-axis clamping, now that columns themselves are clamped. ( #2221 )  
							
							... 
							
							
 
							
							Amend 00d3f92f2d147240cc20fca8 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								da3d7e1587 
								
							
								 
							
						 
						
							
							
								
								Focus: added an early out in FocusWindow() for the common case.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								565aa0b763 
								
							
								 
							
						 
						
							
							
								
								Examples: Vulkan: pick integrated GPU if nothing else is available. ( #6359 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								0fbf2888e7 
								
									
								
							
								 
							
						 
						
							
							
								
								Examples: example_glut_opengl2: Fixed compilation issue ( #6361 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								d2291df551 
								
							
								 
							
						 
						
							
							
								
								Viewports: Fixed setting focus from platform decoration from accidentally closing modals ( #6299 ,  #6357 )  
							
							... 
							
							
 
							
							+ Fixed double-assignment static analyzer warning.
# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								bba39762dc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								4d42450a73 
								
							
								 
							
						 
						
							
							
								
								Focus: amend ImGuiFocusRequestFlags_UnlessBelowModal to bring to front-most below the modal, simplify code in Begin(). ( #6357 ,  #4317 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								01ca196530 
								
							
								 
							
						 
						
							
							
								
								Focus: move focused child restore code in FocusWindow() with ImGuiFocusRequestFlags_RestoreFocusedChild flag. ( #6357 )  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								30eceaf95f 
								
							
								 
							
						 
						
							
							
								
								Focus: start moving modal check into FocusWindow(), add ImGuiFocusRequestFlags_UnlessBelowModal (currently opt-in, should try to make opt-out). ( #6357 ,  #4317 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								f0fe1957a8 
								
							
								 
							
						 
						
							
							
								
								Focus: merge extra param for FocusTopMostWindowUnderOne() from docking branch to facilitate merge.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								ac38c8e6fe 
								
							
								 
							
						 
						
							
							
								
								IO: removed ImGuiBackendFlags_HasMouseHoveredViewport assert in AddMouseViewportEvent().  
							
							... 
							
							
 
							
							In theory shouldn't accept them, but a backend overriding another would be prevented from doing so because of this (test engine). 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								c11128891e 
								
							
								 
							
						 
						
							
							
								
								Backends: SDL2/SDL3: Update monitor list when receiving a display event. ( #6348 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								adf693c061 
								
							
								 
							
						 
						
							
							
								
								Viewports: added void* ImGuiPlatformMonitor::PlatformHandle field (backend-dependant).  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								00d3f9295e 
								
							
								 
							
						 
						
							
							
								
								Nav: Fixed navigation within tables/columns where item boundaries goes beyond columns limits. ( #2221 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								8d9e50c807 
								
							
								 
							
						 
						
							
							
								
								Nav: fixed IMGUI_DEBUG_NAV_SCORING not setting NavMoveClipDir, leading to debug result not matching real results.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								662ce46971 
								
							
								 
							
						 
						
							
							
								
								Debug Log: Fixed not parsing 0xXXXXXXXX values when the identifier is at the end of the line.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								07e07030a6 
								
							
								 
							
						 
						
							
							
								
								Backends: Win32: revert accidental deletion of ImGui_ImplWin32_EnableAlphaCompositing() in  a566ecc ( #3218 )  
							
							... 
							
							
 
							
							This was still in docking, but moved back in upper locaton.
# Conflicts:
#	backends/imgui_impl_win32.cpp 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								a89590b425 
								
							
								 
							
						 
						
							
							
								
								Backends: Win32: revert accidental deletion of ImGui_ImplWin32_EnableAlphaCompositing() in  a566ecc ( #3218 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								88ac2ced7c 
								
							
								 
							
						 
						
							
							
								
								Backends: DX10: Fixed typo in previous commit.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								f498f084d6 
								
							
								 
							
						 
						
							
							
								
								Examples: Amend Win32/Winapi + OpenGL example for multi-viewport. ( #3218 ,  #5170  and  #6086 ,  #2772 ,  #2600 ,  #2359 ,  #2022 ,  #1553 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								4bc51c6ff4 
								
							
								 
							
						 
						
							
							
								
								Examples: Extend Win32/Winapi + OpenGL example for multi-viewport. ( #3218 ,  #5170  and  #6086 ,  #2772 ,  #2600 ,  #2359 ,  #2022 ,  #1553 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								1f2b84a654 
								
							
								 
							
						 
						
							
							
								
								Backends: clear viewport specific bits in io.BackendFlags on backend Shutdown(). ( #6334 )  
							
							... 
							
							
 
							
							Amend 055e715 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								4f692ba840 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								9308cfdcfb 
								
							
								 
							
						 
						
							
							
								
								Examples: Amend Win32/Winapi + OpenGL example. ( #3218 ,  #5170  and  #6086 ,  #2772 ,  #2600 ,  #2359 ,  #2022 ,  #1553 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								a566ecc58f 
								
							
								 
							
						 
						
							
							
								
								Examples: Add Win32/Winapi + OpenGL example. ( #3218 ,  #5170  and  #6086 ,  #2772 ,  #2600 ,  #2359 ,  #2022 ,  #1553 )  
							
							... 
							
							
 
							
							Removed mulit-viewpot stuff in this commit on master, will be re-added separately. 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								a338b78eb9 
								
							
								 
							
						 
						
							
							
								
								Backends: OpenGL3: amend reset GL_POLYGON_MODE separately for front and back when possible. ( #6333 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								d0836aa89a 
								
							
								 
							
						 
						
							
							
								
								Backends: OpenGL3: reset GL_POLYGON_MODE separately for front and back when possible. ( #6333 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								d6a7aca2f4 
								
							
								 
							
						 
						
							
							
								
								Nav: Debug: tweak debug facilities.  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								0948cfc19e 
								
							
								 
							
						 
						
							
							
								
								InputText: do not set WantTextInputNextFrame during the frame InputText is deactivated. ( #6341 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								e49d31a1c9 
								
							
								 
							
						 
						
							
							
								
								Tables: do not show empty tooltip when user submits TableHeader with no label to display. ( #6342 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)  
				
					
						
							
							
								 
						
							
							
								f94a8344f6 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix minor typos in FAQ ( #6328 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=3 years)