7227454dca 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui.h 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								c23a19c26f 
								
							
								 
							
						 
						
							
							
								
								Internals: Exposed internal SetWindowPos to imgui_internal.h (for imgui-test)  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								f087359621 
								
							
								 
							
						 
						
							
							
								
								Revert part of change from  5536eded. Fixed drag and drop in docking branch. ( #2331 , reopening  #2325 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								e215809c4d 
								
							
								 
							
						 
						
							
							
								
								Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								ac6d474103 
								
							
								 
							
						 
						
							
							
								
								Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								03b0266b59 
								
							
								 
							
						 
						
							
							
								
								Examples: Made imgui_impl_win32 drag gdi32.lib for GetDeviceCaps(). ( #2327 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								5fc6899dc2 
								
							
								 
							
						 
						
							
							
								
								Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). ( #2329 ) [ @BrutPitt ]  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								d1c45c0d76 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking (enable range_select merge)  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								5cb7040f66 
								
							
								 
							
						 
						
							
							
								
								Internals: Tracking dummy select scope id (currently always zero) to facilitate merging of the range_select branch. ( #1861 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								d5945aa25b 
								
							
								 
							
						 
						
							
							
								
								Internals: Minor changes to TreeNodeBehavior() and Selectable() for the benefit of fhe range_select branch. ( #1861 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								0d4a2a2cd0 
								
							
								 
							
						 
						
							
							
								
								Internals: Track ActiveIdHasBeenPressed (similar to ActiveIdHasBeenEdited). This is currently mostly for the benefit of the range_select branch. ( #1861 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								e30babef09 
								
							
								 
							
						 
						
							
							
								
								Fixed Clang/Win32 warning.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								a608156da3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								65a2350a5f 
								
							
								 
							
						 
						
							
							
								
								Docking: Extracted code into a DocknodeUpdateTabListMenu() functions + minor other changes.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								cbf24a9151 
								
							
								 
							
						 
						
							
							
								
								Comments. Fix duplicate entries in About box. Synchronize a few small changes from Master branch.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								52a9f8bd3e 
								
							
								 
							
						 
						
							
							
								
								Merged from Docking branch: Various small changes, comments, typos fixes, moved blocks. To reduce overall drift. Should be no-op.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								699e945a82 
								
							
								 
							
						 
						
							
							
								
								Merged from Docking branch: non-const ImVec2[] operator.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								f906d53f7d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								1f2bdd37b3 
								
							
								 
							
						 
						
							
							
								
								Docking: Builder: Added DockBuilderSetNodePos, DockBuilderSetNodeSize, allow DockBuilderAddNode creating floating node (dockspace requires ImGuiDockNodeFlags_Dockspace) ( #2109 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								dc8ff68871 
								
							
								 
							
						 
						
							
							
								
								Docking: VisibleWindow of a node spread its _NoMove attribute to the node (fixed dragging or undocking of dock node host from collapse button). ( #2325 ,  #2109 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								5536edede9 
								
							
								 
							
						 
						
							
							
								
								Docking: Fixed faulty undocking of windows with the _NoMove flag. ( #2325 ,  #2109 )  
							
							... 
							
							
 
							
							Whereas BeginAsDockableDragDropTarget could be reworked to filter, we simply set g.HoveredWindowUnderMovingWindow to be NULL when MovingWindow is not set, which was the initial intent.
Also fixed some comments and removed unused braces in TabItemEx(). 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								578e15f006 
								
							
								 
							
						 
						
							
							
								
								Docking: Removed unnecessary ImGuiTabItemFlags_DockedWindow internal flag.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								2d363fa315 
								
							
								 
							
						 
						
							
							
								
								Fixed doc typo ( #2326 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								16c0a0217c 
								
							
								 
							
						 
						
							
							
								
								Updating supporter list.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								e1143377c2 
								
							
								 
							
						 
						
							
							
								
								Viewport: Added ImGuiViewportFlags_NoFocusOnClick + support in imgui_impl_win32. Made windows with no decoration always set the _NoFocus flags. ( #1542 ,  #2117 )  
							
							... 
							
							
 
							
							Fix e.g. clicking on protruding combo box stealing highlight from parent window with decoration. 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								8563ef3ce4 
								
							
								 
							
						 
						
							
							
								
								Viewport: Popups by default merge into parent/host viewport as they have no decoration (same as menu/child). ( #1542 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								1fb57c97c6 
								
							
								 
							
						 
						
							
							
								
								Internals: InputScalarAsWidgetReplacement: Fixed seemingly unnecessary calling of SetActiveID/SetHoveredID every frame, which in turns allow us to remove the g.ActiveIdAllow/Block settings duplicated.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								fb4f1ff7f6 
								
							
								 
							
						 
						
							
							
								
								InputText: Fixed a bug where ESCAPE would be first captured by the Keyboard Navigation code. ( #2321 ,  #787 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								158995f271 
								
							
								 
							
						 
						
							
							
								
								InputText: Fixed a bug where ESCAPE would not restore the initial value in all situations. ( #2321 ) [ @relick ]  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								0a233a505d 
								
							
								 
							
						 
						
							
							
								
								imgui-test: Added extra item info callbacks. Using nav_bb for interactions when possible. Comments, Demo tweaks.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								aacf993ee1 
								
							
								 
							
						 
						
							
							
								
								ImStrncpy: Fixed -Wstringop-truncation warning on GCC8 ( #2323 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								37fb531d1c 
								
							
								 
							
						 
						
							
							
								
								Docking: Comments and tidying up (should be no-op)  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								86d3bba157 
								
							
								 
							
						 
						
							
							
								
								Added ImGuiDockNodeFlags_AutoHideTabBar. ( #2109 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								2ccc6d2ed1 
								
							
								 
							
						 
						
							
							
								
								Docking: Exposing extra flag in Configuration panel. Moved some forgotten Changelog entries at the right place.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								ed240c910b 
								
							
								 
							
						 
						
							
							
								
								Demo: Fixed "Log" demo not initializing properly, leading to the first line not showing before a Clear. ( #2318 ) [ @bluescan ]  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								8a4422b2fa 
								
							
								 
							
						 
						
							
							
								
								Fixed CloseCurrentPopup() on a child-menu of a modal incorrectly closing the modal. ( #2308 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								13ca2fe845 
								
							
								 
							
						 
						
							
							
								
								Silence XCode static analysis false positive ( #2309 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								8a605354ef 
								
							
								 
							
						 
						
							
							
								
								Replacing one of the third-party Python bindings. ( #2312 )  
							
							... 
							
							
 
							
							Removing the unmaintained CyImGui (only 7 commits, last one made in 2015) and replacing it with bimpy. 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								13a5f5ba8b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								b26ac92a12 
								
							
								 
							
						 
						
							
							
								
								Revert "Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages)."  
							
							... 
							
							
 
							
							This reverts commit 20bc06af70 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								f56d9b74cc 
								
							
								 
							
						 
						
							
							
								
								Nav: Removed unnecessary test (always failing).  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								4e8e177cac 
								
							
								 
							
						 
						
							
							
								
								Persistently fixing some PVS-Studio static analyzer false positive warnings.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								ee3b4f2bf1 
								
							
								 
							
						 
						
							
							
								
								Using IM_UNUSED() macro.  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								c3c2cd1e82 
								
							
								 
							
						 
						
							
							
								
								Fix various XCode and PVS-Studio static analyzer warnings ( #2309 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								20bc06af70 
								
							
								 
							
						 
						
							
							
								
								Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages).  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								737a3644fc 
								
							
								 
							
						 
						
							
							
								
								Removed trailing spaces (docking branch)  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								e55678adec 
								
									
								
							
								 
							
						 
						
							
							
								
								Update README.md (changed e-mail address)  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								a8277ca873 
								
									
								
							
								 
							
						 
						
							
							
								
								Reoder Python bindings  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								07ff47bf1b 
								
							
								 
							
						 
						
							
							
								
								Docking: Fixed various border / padding related inconsistency with dock node vs floating windows. ( #2109 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)  
				
					
						
							
							
								 
						
							
							
								0737433c71 
								
							
								 
							
						 
						
							
							
								
								When resizing from an edge, the border is more visible and better follow the rounded corners. Border rendering moved to RenderOuterBorders so it can be called in a different order for docking. ( #1495 ,  #822 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=7 years)