088ef6623a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'viewport' into docking  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								9c916cdaf9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								ae76a1fda7 
								
							
								 
							
						 
						
							
							
								
								Window, Focus, Popup: Fixed an issue where closing a popup by clicking another window with the _NoMove flag would refocus the parent window of the popup instead of the newly clicked window.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								510ca373a2 
								
							
								 
							
						 
						
							
							
								
								Moved setting up NavHideHighlightOneFrame from lower-level ClosePopupToLevel() to CloseCurrentPopup() with an explanation. (Followup on  68d3e139a7)  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								1a6ec208cc 
								
							
								 
							
						 
						
							
							
								
								Docs: various updates, rewording, clarifying the purpose of a PR.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								ac9512e095 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								65dac02171 
								
							
								 
							
						 
						
							
							
								
								Internals: Popups: Renamed CurrentPopupStack to BeginPopupStack which is much less ambiguous.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								f6f5c51106 
								
							
								 
							
						 
						
							
							
								
								Internals: Popups: EndMenu() calls ClosePopupToLevel(g.CurrentPopupStack.Size) which is more correct.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								f1c7596409 
								
							
								 
							
						 
						
							
							
								
								Internals: Popup related comments. Renamed the misleading internal ClosePopup() function. Added bool* test to BeginPopupModal in demo.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								5d20da1b36 
								
							
								 
							
						 
						
							
							
								
								Viewport, DPI: Now using DpiScale from the ImGuiPlatformMonitor array instead of calling Platform_GetWindowDpiScale() before the platform window creation. Might even tentatively see if things work out without Platform_GetWindowDpiScale. ( #1676 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								587506dd57 
								
							
								 
							
						 
						
							
							
								
								Tests: Changed prototype of ImGuiTestEngineHook_ItemAdd to match functions called in same spot. Made ButtonBehavior submit fallback item info if ItemAdd() was not called (for resize grips, resize borders, scrollbar, columns, etc.)  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								9b09c7597f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'viewport' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui_demo.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								2a1e903f43 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.h 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								8497948ba0 
								
							
								 
							
						 
						
							
							
								
								Comments, minor tweaks.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								e50894c95e 
								
							
								 
							
						 
						
							
							
								
								Metrics: Fixed crash when viewports are disabled (g.MouseLastHoveredViewport is never set).  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								991b16cc6a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_widgets.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								1b263f6ab0 
								
							
								 
							
						 
						
							
							
								
								Tabs: Fixed support for drag and drop ImGuiButtonFlags_PressedOnDragDropHold. ( #261 ) incorrectly missing from the merge from Docking branch.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								febc3e6aa1 
								
							
								 
							
						 
						
							
							
								
								Internals: Windows hidden with HiddenFramesRegular (but NOT HiddenFramesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								d9a84de9d9 
								
							
								 
							
						 
						
							
							
								
								Contents size is preserved while a window collapsed. Fix auto-resizing window losing their size for one frame when uncollapsed.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								ccce47c6a2 
								
							
								 
							
						 
						
							
							
								
								Demo: Using Tabs in Style Editor and Simple Layout example. + Adding missing early out in About and Documents examples.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								5a6b8e00db 
								
							
								 
							
						 
						
							
							
								
								BeginTabBar: Fix to push the expected ID into the ID stack (instead of a hash's hash). ( #261 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								2886e0b6f5 
								
							
								 
							
						 
						
							
							
								
								Demo: Fix collateral damage of  54a60aa 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								95dcc534ed 
								
							
								 
							
						 
						
							
							
								
								Demo: Fix collateral damage of  54a60aa 
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								067b691fd8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'viewport' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	docs/TODO.txt
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_draw.cpp
#	imgui_internal.h
#	imgui_widgets.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								c40feabe4d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								54a60aaa40 
								
							
								 
							
						 
						
							
							
								
								Added BETA api for Tab Bar/Tabs widgets. ( #261 ,  #351 ) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature)  
							
							... 
							
							
 
							
							- Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API.
- Added ImGuiTabBarFlags flags for BeginTabBar().
- Added ImGuiTabItemFlags flags for BeginTabItem().
- Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors.
- Demo: Added Layout->Tabs demo code.
- Demo: Added "Documents" example app showcasing possible use for tabs. 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								cc1283fb78 
								
							
								 
							
						 
						
							
							
								
								Added ImGuiWindowFlags_UnsavedDocument window flag to append '*' to title without altering the ID, as a convenience to avoid using the ### operator. (merged from Docking branch)  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								15447f5b7b 
								
							
								 
							
						 
						
							
							
								
								Using named flags instead of 0 + shallow formatting tweaks from other branches.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								2d4018aa89 
								
							
								 
							
						 
						
							
							
								
								Docking: Fix io.ConfigWindowsMoveFromTitleBarOnly for docking branch.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								e6439e1a16 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								26b9e2d0a5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								9476e07d5a 
								
							
								 
							
						 
						
							
							
								
								Added io.ConfigWindowsMoveFromTitleBarOnly option. Still is ignored by window with no title bars (often popups). This affects clamping window within the visible area: with this option enabled title bars need to be visible. ( #899 )  
							
							... 
							
							
 
							
							Tweaked default value of style.DisplayWindowPadding from (20,20) to (19,19) so the default style as a value which is the same as the title bar height. 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								59f3c4fc20 
								
							
								 
							
						 
						
							
							
								
								Renamed io.ConfigResizeWindowsFromEdges to io.ConfigWindowsResizeFromEdges and removed its [Beta] mark. Resizing windows from edge is now enabled by default (io.ConfigWindowsResizeFromEdges=true). Note that it only works _if_ the back-end sets ImGuiBackendFlags_HasMouseCursors, which the standard back-end do.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								d20e3ee710 
								
							
								 
							
						 
						
							
							
								
								Tests: Adding imgui-test engine hooks (experimental) to provide missing widget state to the testing system.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								3a5e758ee3 
								
							
								 
							
						 
						
							
							
								
								Tabs: Fixed crash when using TabItem in a regular (non-docking) tab bar. ( #2231 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								f768727284 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'viewport' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								a03846bd9e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								f3a0b17bb8 
								
							
								 
							
						 
						
							
							
								
								Viewport: Win32, GLFW, SDL: Clarified back-ends by using global mouse position direction. GLFW: disabled io.MouseHoveredViewport setting under Mac/Linux. ( #1542 ,  #2117 ) + various comments.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								ac52d9d44c 
								
							
								 
							
						 
						
							
							
								
								Viewport: Fix handling of PlatformRequestResize/PlatformRequestPos. when OS decoration are enabled via ImGuiConfigFlags_ViewportsDecoration .  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								e2082a675c 
								
							
								 
							
						 
						
							
							
								
								Viewport: Fix handling of PlatformRequestResize/PlatformRequestPos. when OS decoration are enabled via ImGuiConfigFlags_ViewportsDecoration .  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								b94f0241f1 
								
							
								 
							
						 
						
							
							
								
								Docking: Adjusting the docking popup menu position so it tends to stay within the same viewport.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								b96b1f2412 
								
							
								 
							
						 
						
							
							
								
								Docking: Documenting an issue. Renamed member of ImGuiDockFamily.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								125e62491e 
								
							
								 
							
						 
						
							
							
								
								Internals: Nav: Added ImGuiNavLayer_ to clarify semantic of previously integer NavLayer values, and not pretend that increment/decrement operators on them super flexible. + Storage tweaks.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								b58bd5b311 
								
							
								 
							
						 
						
							
							
								
								Version 1.67 WIP + todo notes  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								6644f1ff64 
								
							
								 
							
						 
						
							
							
								
								Docking: Added io.ConfigDockingTabBarOnSingleWindows option (mostly made possible by the previous fixes).  
							
							... 
							
							
 
							
							Note that dock node have regressions compared to current floating window: no collapse, no auto-resize, resize grip under the scrollbar, border issues, general overhead. Will tackle those. 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								8cac70d8af 
								
							
								 
							
						 
						
							
							
								
								Docking: Focus fix (missing line in  8bac6d4)  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								5105c6c0d0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'viewport' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								3a678d48b1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into viewport  
							
							... 
							
							
 
							
							# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								8bac6d428d 
								
							
								 
							
						 
						
							
							
								
								Docking: Another attempt at tidying the inconsistent focus / tab bar reordering issues, and toward generalizing single window dock nodes. ( #2109 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								2da200fc16 
								
							
								 
							
						 
						
							
							
								
								Docking: Fix generalizing the transition from loose windows to dock node so we can switch to single window dock node while transferring viewports (vs creating two viewports and dropping one). + Extracted DockContextGenNodeID out of DockContextAddNode().  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)