omar 
							
						 
					 
					
						
						
							
						
						16a9488c13 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp 
						
						
					 
					
						2020-03-19 12:44:53 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						fbc93debf9 
					 
					
						
						
							
							Internal: Refactor: Moved NewFrameSanityChecks as ErrorCheckNewFrameSanityChecks()  
						
						 
						
						
						
						
					 
					
						2020-03-19 12:27:16 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						ccf0cc8584 
					 
					
						
						
							
							Added ImGuiKeyModFlags. Added additional checks in EndFrame() to verify that io.KeyXXX values have not been tampered with between NewFrame() and EndFrame().  
						
						 
						
						
						
						
					 
					
						2020-03-19 12:24:32 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						d8824f9a9a 
					 
					
						
						
							
							CI: Clarify purpose of example_null, Changelog  
						
						 
						
						
						
						
					 
					
						2020-03-19 11:13:52 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rokas Kupstys 
							
						 
					 
					
						
						
							
						
						ac5ffffc23 
					 
					
						
						
							
							CI: Test builds with freetype on linux.  
						
						 
						
						
						
						
					 
					
						2020-03-19 11:05:53 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						bdd31ec4db 
					 
					
						
						
							
							Internal: Refactor: Moved RenderColorRectWithAlphaCheckerboard() to imgui_draw.cpp, tweaked signature.  
						
						 
						
						
						
						
					 
					
						2020-03-18 22:48:23 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						0bbbbe0f68 
					 
					
						
						
							
							Internal: Refactor: Moved RenderArrow, RenderBullet, RenderCheckMark to imgui_draw.cpp, changed RenderCheckMark to avoid using ImGui context  
						
						 
						
						
						
						
					 
					
						2020-03-18 22:48:22 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Kalnischkies 
							
						 
					 
					
						
						
							
						
						2fd411a83e 
					 
					
						
						
							
							Support custom stb_rect_pack filename in Freetype ( #3062 )  
						
						 
						
						... 
						
						
						
						Copies the #define magic from imgui_draw.cpp to the imgui_freetype implementation to allow the use of a custom stb rect_pack here as well.
References: fe5347ef94 
						
						
					 
					
						2020-03-18 22:14:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rokas Kupstys 
							
						 
					 
					
						
						
							
						
						75a65f6fb0 
					 
					
						
						
							
							CI: Test build with large indices, obsolete functions disabled and demo/metrics windows disabled.  
						
						 
						
						... 
						
						
						
						+ amend notes 
						
						
					 
					
						2020-03-17 20:33:28 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						339ffd25a9 
					 
					
						
						
							
							Internals: Renamed ImBoolVector to ImBitVector, added low-level loose function to replicate the behavior include a help SetBitRange() function.  
						
						 
						
						
						
						
					 
					
						2020-03-13 18:50:02 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						1d5612a05e 
					 
					
						
						
							
							Internal: Added two missing ImVec2 operators for consistency. Split up DragDropWithinSourceOrTarget  
						
						 
						
						... 
						
						
						
						ImVec2 *= ImVec2 to match  ImVec2 * ImVec2, likewise with / 
						
						
					 
					
						2020-03-12 20:58:24 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						ea0399414c 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 
					
						2020-03-11 22:30:34 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						1abb02fb67 
					 
					
						
						
							
							Viewports: Fix for UWP on IME code moved back-end side ( #2895 ,  #2892 ) + Docking: Comments.  
						
						 
						
						
						
						
					 
					
						2020-03-11 22:28:31 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						b016f1ad70 
					 
					
						
						
							
							Examples: SDL+DX11: Fixed resizing main window. Amend ( #3057 )  
						
						 
						
						
						
						
					 
					
						2020-03-11 21:22:52 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joeslay 
							
						 
					 
					
						
						
							
						
						a0f01d2290 
					 
					
						
						
							
							Improve resizing in dx11 example ( #3057 )  
						
						 
						
						... 
						
						
						
						Make the dx11 example implementation resize the window in a sane way, i.e. not the stretching/scaling the initial render to fit the new window size (current behaviour). 
						
						
					 
					
						2020-03-11 21:22:52 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						a5041c8820 
					 
					
						
						
							
							Focus: Child inherit focus scope from parent (amend  2ebe08be).  
						
						 
						
						
						
						
					 
					
						2020-03-11 21:07:39 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						9a46a19e99 
					 
					
						
						
							
							Internals: Rename ImGuiSelectableFlags_PressedOnXXX to ImGuiSelectableFlags_SelectOnXXX, ImGuiButtonFlags_NoHoveredOnNav to ImGuiButtonFlags_NoHoveredOnFocus.  
						
						 
						
						
						
						
					 
					
						2020-03-11 21:07:32 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						4a10af2bda 
					 
					
						
						
							
							Unicode, Windows: Remove stringapiset.h include (breaks vs2010 and seems unnecessary?). ( #2541 ,  #2815 )  
						
						 
						
						
						
						
					 
					
						2020-03-11 13:25:50 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						e137db2df7 
					 
					
						
						
							
							CI: Enable error on warnings for the extra warnings builds as an experiment. FAQ tweaks  
						
						 
						
						
						
						
					 
					
						2020-03-10 14:09:47 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						aef057e975 
					 
					
						
						
							
							Internals: Added GetInputTextState() + comments.  
						
						 
						
						
						
						
					 
					
						2020-03-07 15:55:05 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						2dcf8df9f4 
					 
					
						
						
							
							Internals: Shuffled some of the windows-specific includes to avoid duplication. Might have undesirable side-effects on some compilers, please report!  
						
						 
						
						
						
						
					 
					
						2020-03-07 15:51:50 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						de37a0bfab 
					 
					
						
						
							
							Internals: fix potential warning. Comments around include sections. Moved a few bits.  
						
						 
						
						
						
						
					 
					
						2020-03-07 15:40:22 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						1b5b87a40e 
					 
					
						
						
							
							Internals: Added #define NOMINMAX before windows.h include for single-compile-unit builds.  
						
						 
						
						
						
						
					 
					
						2020-03-07 15:19:51 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						fbaf65b8f6 
					 
					
						
						
							
							Revert "Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy ( #1542 )"  
						
						 
						
						... 
						
						
						
						This reverts commit f2c7f3b200 . 
						
						
					 
					
						2020-03-06 17:53:09 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						f2c7f3b200 
					 
					
						
						
							
							Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy ( #1542 )  
						
						 
						
						
						
						
					 
					
						2020-03-06 17:28:32 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						1b579a110d 
					 
					
						
						
							
							Viewports: Lots of comments about setting up multi-viewports. ( #1542 )  
						
						 
						
						
						
						
					 
					
						2020-03-06 17:25:25 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rokas Kupstys 
							
						 
					 
					
						
						
							
						
						7e00cde8a9 
					 
					
						
						
							
							Disable false-positive warning that papeared in pvs-studio v7.06.37052.34.  
						
						 
						
						
						
						
					 
					
						2020-03-05 15:26:20 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						1ecc1db226 
					 
					
						
						
							
							Fix GCC warning  
						
						 
						
						
						
						
					 
					
						2020-03-05 12:35:01 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						a7ace918fe 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	examples/imgui_impl_win32.cpp
#	imgui.cpp 
						
						
					 
					
						2020-03-05 11:48:57 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						0850b46c88 
					 
					
						
						
							
							ImDrawList: Internals: Added IM_DRAWLIST_ARCFAST_TESSELLATION_MULTIPLIER setting.  
						
						 
						
						
						
						
					 
					
						2020-03-03 19:26:27 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						b029182a73 
					 
					
						
						
							
							Merge branch 'features/unicode'  
						
						 
						
						
						
						
					 
					
						2020-03-03 18:59:54 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						897704cb49 
					 
					
						
						
							
							Menus: Tweak for first-level menu windows to be positioned regardless of MenuBarHeight() which is not stored in window, allowing undocumented modification of the menu bar height).  
						
						 
						
						
						
						
					 
					
						2020-03-03 18:57:07 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						a41332453e 
					 
					
						
						
							
							Unicode: Changelog, comments, minimum CI integration. ( #2541 ,  #2538 ,  #2815 )  
						
						 
						
						
						
						
					 
					
						2020-03-03 18:53:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						0283a6e566 
					 
					
						
						
							
							ImFont:  Demo, Store Used4kPagesMap[] map in ImFont to facilitate iteration on all codepoints with a large value of IM_UNICODE_CODEPOINT_MAX. ( #2815 )  
						
						 
						
						... 
						
						
						
						Demo uses IsGlyphRangeUnused() 
						
						
					 
					
						2020-03-03 18:53:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Hocevar 
							
						 
					 
					
						
						
							
						
						c8ea0a017d 
					 
					
						
						
							
							Unicode: UTF32 support improvements ( #2541 ,  #2538 ,  #2815 )  
						
						 
						
						... 
						
						
						
						- Make ImWchar32 unsigned.
 - Fix Win32 version of ImFileOpen by including windows.h sooner.
 - Make ImGuiIO::AddInputCharacterUTF16() more robust by disallowing illegal
surrogate pairs.
 - Allow pushing higher plane codepoints through ImGuiIO::AddInputCharacter().
 - Minor cleaning up in the high-plane Unicode support.
 - Fix Clang -Wunreachable-code warning 
						
						
					 
					
						2020-03-03 18:53:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cloud Wu 
							
						 
					 
					
						
						
							
						
						6d59653e82 
					 
					
						
						
							
							Unicode: full Unicode Support (6 squashed commits) ( #2541 ,  #2538 )  
						
						 
						
						... 
						
						
						
						fix build for WideCharToMultiByte
[3181ff1e] Full Unicode Support
[6c9e73ac] Fix ImTextCountUtf8BytesFromChar and ImTextCharToUtf8, these APIs assume the input is an unicode code point, not UTF-16
[ba85665b] Add AddInputCharacterUTF16 for windows backend to handle WM_CHAR
[fafdcaf0] Use Windows API to convert UTF-16 for ImFileOpen
[dc7d5925] Use windows API to convert UTF-16 for clipboard 
						
						
					 
					
						2020-03-03 18:53:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						91ac93f9a6 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 
					
						2020-03-03 17:06:38 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						8c683de33f 
					 
					
						
						
							
							Internals: Refactor: Moved get height and contents regions functions, to Layout section. IF YOU GREAT CONFLICTS WHILE MERGING (NOT REBASING) THOSE 6 PREV COMMITS, TRY MERGING THEM INDIVIDUALLY 1 by 1 or 2 by 2 etc.  
						
						 
						
						
						
						
					 
					
						2020-03-03 17:04:32 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						05c3e0b898 
					 
					
						
						
							
							Merge commit 'caca55c642d16cf1c2649831c5d06b1f26146d12' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp 
						
						
					 
					
						2020-03-03 17:03:47 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						602df11f19 
					 
					
						
						
							
							Internals: Refactor: Moved item width/size functions to Layout section.  
						
						 
						
						
						
						
					 
					
						2020-03-03 16:28:03 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						6c1810e503 
					 
					
						
						
							
							Internals: Refactor: Moved cursor position functions to Layout section.  
						
						 
						
						
						
						
					 
					
						2020-03-03 16:27:58 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						3ce26f65d4 
					 
					
						
						
							
							Internals: Refactor: Moved ItemAdd(), ItemSize(), BeginGroup(), EndGroup(), SameLine(), Indent(), Unindent() to Layout section.  
						
						 
						
						
						
						
					 
					
						2020-03-03 16:27:49 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						caca55c642 
					 
					
						
						
							
							Internals: Refactor: Moved code into a Styling section and some code into the Error Handling section.  
						
						 
						
						
						
						
					 
					
						2020-03-03 16:03:28 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						2679bee28d 
					 
					
						
						
							
							Internals: Refactor: Moved code out of NewFrame() into UpdateTabFocus() and UpdateSettings()  
						
						 
						
						
						
						
					 
					
						2020-03-03 16:03:28 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						095dc996b0 
					 
					
						
						
							
							Disable deprecated-enum-enum-conversion ( #3040 ,  #2983 )  
						
						 
						
						
						
						
					 
					
						2020-03-02 16:13:48 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						628614c6ea 
					 
					
						
						
							
							Demo: Remove unnecessary code added by  24bd33ac.  
						
						 
						
						
						
						
					 
					
						2020-03-02 15:49:51 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						24bd33ace8 
					 
					
						
						
							
							Menus: Some renaming, comments, add to demo. Amend  0342a3c. ( #1207 )  
						
						 
						
						
						
						
					 
					
						2020-02-28 16:42:24 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rokas Kupstys 
							
						 
					 
					
						
						
							
						
						0342a3c548 
					 
					
						
						
							
							Menus: Implement BeginMenu() appending to existing menu when executed with same ID multiple times. ( #1207 )  
						
						 
						
						
						
						
					 
					
						2020-02-28 16:35:33 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						103c5edaaa 
					 
					
						
						
							
							Internals: debug log macros.  
						
						 
						
						
						
						
					 
					
						2020-02-27 16:10:36 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						75de34e281 
					 
					
						
						
							
							Viewports, Docking: Added per-viewport work area system for e.g. menu-bars. Fixed DocksapceOverViewport() and demo code (overlay etc) ( #3035 ,  #2889 ,  #2474 ,  #1542 ,  #2109 )  
						
						 
						
						... 
						
						
						
						Clarified that BeginMenuMainBar() had an incorrect knowledge of its height (which was previously harmless).
Designed to easily allow for status bars although we don't have/use them yet, but custom code could use them. 
						
						
					 
					
						2020-02-26 23:58:45 +01:00