a1e43c682a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking (with fixes)  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								8f40020ca6 
								
							
								 
							
						 
						
							
							
								
								Disable Win32 clipboard and IME functions when build target UWP ( #2892 ,  #2895 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								be05e12e21 
								
							
								 
							
						 
						
							
							
								
								Misc: Using static_assert() when using C++11, instead of our own construct (avoid zealous Clang warnings).  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								b23dcab6e1 
								
							
								 
							
						 
						
							
							
								
								Fix  25eee91 incorrect assert when ending a child-popup (rarely used but used by sub-nenus)  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								be436e2b0b 
								
							
								 
							
						 
						
							
							
								
								Fix HelpMarker() symbol collision for unity builds ( #2893 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								03852470de 
								
							
								 
							
						 
						
							
							
								
								Internals: Routing recoverable user errors via  IMGUI_USER_ERROR() macro. ( #1651 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								25eee91542 
								
							
								 
							
						 
						
							
							
								
								Error handling: Assert if user mistakenly calls End() instead of EndChild() on a child window. ( #1651 )  
							
							... 
							
							
 
							
							Internals: Moved some error handling code. 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								b138f8cbcd 
								
							
								 
							
						 
						
							
							
								
								Internal: Nav rename preparing for nav inputs ownership changes. IsNavInputPressed() -> IsNavInputTest()  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								7c441e37fa 
								
							
								 
							
						 
						
							
							
								
								CI: Update jobs to MacOS latest (Catalina)  
							
							... 
							
							
 
							
							Metrics: Added description to Item Picker. 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								c3fd4ae473 
								
							
								 
							
						 
						
							
							
								
								Docking: comments  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								6e8e2c0fa9 
								
							
								 
							
						 
						
							
							
								
								Scrollbar: Fixed an issue where scrollbars wouldn't display on the frame following a frame where all child window contents would be culled.  
							
							... 
							
							
 
							
							Demo: Fixed a small bug with scrolling demo.
Metrics: Tweaks. 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								69b5c2f541 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								57dc34f4e8 
								
							
								 
							
						 
						
							
							
								
								TreeNode: Added IsItemToggledOpen() to explicitly query if item was just open/closed, facilitating interactions with custom multi-selections patterns. ( #1896 ,  #1861 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								011d475532 
								
							
								 
							
						 
						
							
							
								
								TreeNode: The collapsing arrow accepts click even if modifier keys are being held, facilitating interactions with multi-select patterns. ( #2886 ,  #1896 ,  #1861 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								037126ee0e 
								
							
								 
							
						 
						
							
							
								
								TreeNode: Reworded code for ImGuiTreeNodeFlags_OpenOnArrow (follow up to  f79b2d6c) to make it lightweight. Should be a no-op from user's point of view. Will facilitate using the arrow hovering information in the hot path. ( #2886 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								d003674f2c 
								
							
								 
							
						 
						
							
							
								
								Internals: Added ImChunkStream, used by window settings. (more generic followup to  4c13807, the class will be used more extensively by Tables)  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								a337e219b6 
								
							
								 
							
						 
						
							
							
								
								Internals: ImPool: Renaming.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								28f1d60de1 
								
							
								 
							
						 
						
							
							
								
								Internals: Renaming + added ImStrSkipBlank() from docking branch.  
							
							... 
							
							
 
							
							(cherry picked from commit a573943fa0ce323ffb4080e57f5e8fe1bc777c36) 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								09b2310237 
								
							
								 
							
						 
						
							
							
								
								Internals: Added index of helpers and shuffled a few things.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								4c13807b7d 
								
							
								 
							
						 
						
							
							
								
								Misc: Optimized storage of window settings data (reducing allocation count).  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								3929255b77 
								
							
								 
							
						 
						
							
							
								
								Examples: Emscripten: Removed BINARYEN_TRAP_MODE=clamp from Makefile which was removed in Emscripten 1.39.0 but required prior to 1.39.0, making life easier for absolutely no-one. ( #2877 ,  #2878 ) [ @podsvirov ]  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								916487a653 
								
							
								 
							
						 
						
							
							
								
								example_emscripten: skip outdated compiler option  
							
							... 
							
							
 
							
							For more info see: https://github.com/ocornut/imgui/issues/2877  
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								bff2d5d5e2 
								
									
								
							
								 
							
						 
						
							
							
								
								Update README.md  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								a704614b3e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								c9182424a8 
								
							
								 
							
						 
						
							
							
								
								Normalize all the line endings.  
							
							... 
							
							
 
							
							(cherry picked from commit f1772d44be09fd78bf5f1ebda44b39b96180d319) 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								c9ffa62e1f 
								
							
								 
							
						 
						
							
							
								
								Add .gitattributes with rules for line endings of files.  
							
							... 
							
							
 
							
							(cherry picked from commit f2a2be72b341f55c44a035b1257177d83489ea5c) 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								bcd752cfcc 
								
							
								 
							
						 
						
							
							
								
								CI: Fix emscripten builds after portable SDK archive became unavailable.  
							
							... 
							
							
 
							
							(cherry picked from commit 14b18697e653de80f75af18113033b2086846194) 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								792a8631aa 
								
							
								 
							
						 
						
							
							
								
								Metrics: Expose basic details of each window key/value state storage.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								8fee5a4349 
								
							
								 
							
						 
						
							
							
								
								Internals: Renaming for consistency.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								5006639526 
								
							
								 
							
						 
						
							
							
								
								CI: Add scheduled builds and limit some examples to build only on schedule in order to decrease time of builds performed on each push.  
							
							... 
							
							
 
							
							(cherry picked from commit 6c0e1baca29b853586dadf75eb32ef75e2725f10) 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								5ebd4e4c6e 
								
							
								 
							
						 
						
							
							
								
								CI: Install SDL SDK in windows workers and add SDL examples to the build.  
							
							... 
							
							
 
							
							CI: Add Vulkan GLFW and SDL builds to windows build job. 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								a4420be1a2 
								
							
								 
							
						 
						
							
							
								
								CI: Split builds of examples into separate jobs.  
							
							... 
							
							
 
							
							(cherry picked from commit ee73b1b5a47f176ab123239aa3cbcc2cdf284383) 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								9f979c33f4 
								
							
								 
							
						 
						
							
							
								
								CI: Fix builds failing because of missing v140 toolset and SDK on dx12 sample.  
							
							... 
							
							
 
							
							(cherry picked from commit 8d91a77e9b42eac7a6d7d28c8563ccc468842e8b) 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								d62a413476 
								
							
								 
							
						 
						
							
							
								
								Misc: Windows: Do not use _wfopen() if IMGUI_DISABLE_WIN32_FUNCTIONS is defined. ( #2815 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								6024051a2f 
								
							
								 
							
						 
						
							
							
								
								Viewport: Fixed  32380a0 ( #2876 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								b3e94f5de8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								6bf5aed325 
								
							
								 
							
						 
						
							
							
								
								Declaration and assignment can be joined, Member function may be 'const'. ( #2875 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								c863c1f6a1 
								
							
								 
							
						 
						
							
							
								
								Clean up number rounding. Now it is more obvious what code is doing. ( #2862 )  
							
							... 
							
							
 
							
							Add IM_ROUND() macro
Replace IM_FLOOR(n + 0.5f) and ImFloor(n + 0.5f) with IM_ROUND(n) 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								32380a0112 
								
							
								 
							
						 
						
							
							
								
								Viewport: Store current dpi scale in context.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								0b2d35f63f 
								
							
								 
							
						 
						
							
							
								
								Fix snprintf and vsnprintf definition inconsistencies.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								4e56de757c 
								
							
								 
							
						 
						
							
							
								
								Doc: Promote Discord over Discourse. Obsoleting Discourse server.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								f002a11898 
								
							
								 
							
						 
						
							
							
								
								Backends: OpenGL3: Fix building with pre-3.2 GL bindings which do not expose glDrawElementsBaseVertex(), using runtime GL version to decide if we set ImGuiBackendFlags_RendererHasVtxOffset. ( #2866 ,  #2852 ) [ @dpilawa ]  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								4d0c88e9e6 
								
							
								 
							
						 
						
							
							
								
								Backends: GL3: Fix compile for < 3.2 bindings where glDrawElementsBaseVertex is not available. ( #2866 ,  #2852 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								664fb38e39 
								
							
								 
							
						 
						
							
							
								
								Docking: child windows don't use style.ChildRounding.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								9b323a7ebf 
								
							
								 
							
						 
						
							
							
								
								SplitterBehavior: not using FrameRounding in render (was in first commit of the function, not sure why). ( #319 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								0cbb96895a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into docking  
							
							... 
							
							
 
							
							# Conflicts:
#	examples/imgui_impl_dx12.cpp
#	imgui.cpp
#	imgui.h
#	imgui_widgets.cpp 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								3c238ecae3 
								
							
								 
							
						 
						
							
							
								
								Move issue_template and pull_request_template to .github folder.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								d5b5a81946 
								
							
								 
							
						 
						
							
							
								
								GitHub Actions CI script for Windows/Linux/MacOS/iOS/Emscripten builds.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								24e9a6e92c 
								
							
								 
							
						 
						
							
							
								
								Remove .travis.yml due to switching to github actions.  
							
							
 
							
						 
						
							ago%!(EXTRA string=6 years)  
				
					
						
							
							
								 
						
							
							
								ec0e953cca 
								
							
								 
							
						 
						
							
							
								
								Fixed a couple of subtle bounding box vertical positioning issues relating to text baseline alignment.  
							
							... 
							
							
 
							
							The issue would generally manifest when laying out multiple items on a same line, with varying heights and text baseline offsets. (#2833 )
Some specific examples, e.g. a button with regular frame padding followed by another item with a multi-line label and no frame padding, such as: multi-line text, small button, tree node item, etc. The second item was correctly offset to match text baseline, and would interact/display correctly,but it wouldn't push the contents area boundary low enough.
Note: previously the second parameter to ItemSize() was 0.0f was default, now -1.0f to signify "no text baseline offset request". If you have code using ItemSize() with an hardcoded zero you may need to change it. (+1 squashed commits) 
							
						 
						
							ago%!(EXTRA string=6 years)