ocornut 
							
						 
					 
					
						
						
							
						
						5d472c4895 
					 
					
						
						
							
							Merge branch 'master' into docking + fixes for  #3259  
						
						... 
						
						
						
						# Conflicts:
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp 
						
						
					 
					
						2020-05-25 18:32:15 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						5ddf60d8ce 
					 
					
						
						
							
							Commit to facilitate branches merges  
						
						
						
						
					 
					
						2020-05-25 18:28:25 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						a06eb83359 
					 
					
						
						
							
							Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. ( #3259 )  
						
						
						
						
					 
					
						2020-05-25 18:15:59 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						0fe5170bc4 
					 
					
						
						
							
							Viewports: Report minimized viewports as zero DisplaySize to be consistent with main branch + comments ( #1542 )  
						
						
						
						
					 
					
						2020-05-25 16:28:55 +02:00 
						 
				 
			
				
					
						
							
							
								Rokas Kupstys 
							
						 
					 
					
						
						
							
						
						6b688561aa 
					 
					
						
						
							
							CI: Test building without C++ runtime on GCC/Clang.  
						
						
						
						
					 
					
						2020-05-25 14:43:18 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						bb2529dd48 
					 
					
						
						
							
							Backends: SDL: Report a zero display-size when window is minimized, consistent with other backends.  
						
						
						
						
					 
					
						2020-05-25 12:26:59 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						a056603d8b 
					 
					
						
						
							
							Backends: Vulkan: Rename internal helper ImGui_ImplVulkanH_CreateWindow to ImGui_ImplVulkanH_CreateOrResizeWindow  
						
						
						
						
					 
					
						2020-05-25 12:12:02 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						9c209d5a90 
					 
					
						
						
							
							Minor amend 9028088 ( #3261 )  
						
						
						
						
					 
					
						2020-05-25 11:42:45 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas Burrus 
							
						 
					 
					
						
						
							
						
						43f79aa210 
					 
					
						
						
							
							Backends: OSX: import the glfw workaround to avoid missing mouse clicks. ( #3261 )  
						
						
						
						
					 
					
						2020-05-25 11:42:45 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas Burrus 
							
						 
					 
					
						
						
							
						
						39d17ca07f 
					 
					
						
						
							
							Examples: Apple: catch events from the right and other mouse buttons when using Cocoa. ( #3260 )  
						
						
						
						
					 
					
						2020-05-25 11:29:41 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d29157ce58 
					 
					
						
						
							
							Moved static array with non-trivial constructors outside of function seems to remove requirement of linking with libstdc++ on some compilers.  
						
						
						
						
					 
					
						2020-05-24 12:32:31 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c8cde28cf3 
					 
					
						
						
							
							IO: AddInputCharacters function ignore 0 input. ( #3252 )  
						
						... 
						
						
						
						Amend ef13d954c8ea0a01#2541 , #2538 , #2815 ) 
						
						
					 
					
						2020-05-20 17:56:08 +02:00 
						 
				 
			
				
					
						
							
							
								Espyo 
							
						 
					 
					
						
						
							
						
						f44962c01a 
					 
					
						
						
							
							Backends: Allegro: Don't call AddInputCharacter if the pressed key has no character. ( #3252 )  
						
						
						
						
					 
					
						2020-05-20 17:48:21 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						75bbbda645 
					 
					
						
						
							
							Examples: Update comments to get SDL2 package with msys2's pacman ( #3251 )  
						
						
						
						
					 
					
						2020-05-20 11:44:00 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						615e9ae345 
					 
					
						
						
							
							Docking: Fix undocking ( #3243 ), amend  7b3d3798 ( #1738 )  
						
						
						
						
					 
					
						2020-05-18 15:08:47 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						417ac68f82 
					 
					
						
						
							
							Internals: AddPolyline: Add spaces for consistency, renaming.  
						
						
						
						
					 
					
						2020-05-18 12:07:53 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						3b3af6b731 
					 
					
						
						
							
							Docking: Fix extraneous function declaration ( #3236 ) + moved some other declarations in imgui_internal to facilitate moving docking code.  
						
						
						
						
					 
					
						2020-05-16 16:11:42 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e4d8267188 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						... 
						
						
						
						# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp 
						
						
					 
					
						2020-05-16 14:14:51 +02:00 
						 
				 
			
				
					
						
							
							
								Mr. Metric 
							
						 
					 
					
						
						
							
						
						39c978f499 
					 
					
						
						
							
							Fix typo/bug introduced by  0679e056 ( #3231 ,  #3209 ,  #1829 ,  #946 ,  #413 )  
						
						
						
						
					 
					
						2020-05-15 10:51:51 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						1cd32d3afe 
					 
					
						
						
							
							Docking: moving small docking context to imgui_internal.h, removed unnecessary indirection, renaming.  
						
						
						
						
					 
					
						2020-05-14 00:19:56 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						476daf9aac 
					 
					
						
						
							
							Settings: Added ReadInitFn pre-load handler.  
						
						... 
						
						
						
						(docking branch already has it, so it'll probably conflict with same contents) 
						
						
					 
					
						2020-05-13 23:51:29 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5fdfa32cce 
					 
					
						
						
							
							Update README.md  
						
						
						
						
					 
					
						2020-05-12 15:42:29 +02:00 
						 
				 
			
				
					
						
							
							
								Chris Savoie 
							
						 
					 
					
						
						
							
						
						03ea87ea28 
					 
					
						
						
							
							Backends, Win32: Request monitor update when dpi awarness is enabled to make sure they have the correct dpi settings.  
						
						
						
						
					 
					
						2020-05-11 19:31:35 +02:00 
						 
				 
			
				
					
						
							
							
								Maru 
							
						 
					 
					
						
						
							
						
						6b80bd9cc3 
					 
					
						
						
							
							Fix GetGlyphRangesKorean() end-range to end at 0xD7A3 (instead of 0xD79D). ( #348 ,  #3217 )  
						
						... 
						
						
						
						https://en.wikipedia.org/wiki/Hangul_Syllables  
					
						2020-05-11 18:01:42 +02:00 
						 
				 
			
				
					
						
							
							
								Chris Savoie 
							
						 
					 
					
						
						
							
						
						c46b79846c 
					 
					
						
						
							
							Metrics: Fix metrics crash with viewports.  
						
						
						
						
					 
					
						2020-05-11 17:54:07 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6636cb9f2f 
					 
					
						
						
							
							Viewports: Don't set ImGuiViewportFlags_NoRendererClear when ImGuiWindowFlags_NoBackground is set. ( #3213 )  
						
						
						
						
					 
					
						2020-05-11 17:29:50 +02:00 
						 
				 
			
				
					
						
							
							
								Rokas Kupstys 
							
						 
					 
					
						
						
							
						
						a6f4b0fd70 
					 
					
						
						
							
							Nav, Menus: Fix vertical wrap-around in menus or popups created with multiple appending calls to  BeginMenu()/EndMenu() or BeginPopup/EndPopup(). ( #3223 ,  #1207 )  
						
						... 
						
						
						
						First call to EndPopup() called NavRequestTryWrapWindow() which performed wrap-around operation while we were not done composing menu. This resulted in navigation wrapping around to first item.
Since wrap-around operation is only valid in last call to EndPopup() and there is no way to know which call is last - this operation is delayed to the end of the frame. 
						
						
					 
					
						2020-05-11 15:30:12 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7b3d379819 
					 
					
						
						
							
							FocusWindow(NULL) correctly steal active id from previous window. ( #1738 ) amend  b0a9bbf6 
						
						
						
						
					 
					
						2020-05-08 18:36:05 +02:00 
						 
				 
			
				
					
						
							
							
								Albert Vaca 
							
						 
					 
					
						
						
							
						
						685ca27d84 
					 
					
						
						
							
							Backends: OpenGL: On OSX, if unspecified by app, made default GLSL version 150. ( #3199 )  
						
						
						
						
					 
					
						2020-05-08 17:32:34 +02:00 
						 
				 
			
				
					
						
							
							
								Ivan Zinkevich 
							
						 
					 
					
						
						
							
						
						1e7672acf4 
					 
					
						
						
							
							Backends: DX12: Fixed OBJECT_DELETED_WHILE_STILL_IN_USE on viewport resizing. ( #3210 )  
						
						... 
						
						
						
						Tested with detaching/attaching a viewport and resizing it. DX12 debug
layer is clean. 
						
						
					 
					
						2020-05-08 17:26:46 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						8596f2b0fc 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 
					
						2020-05-08 17:07:40 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4f33dd15c4 
					 
					
						
						
							
							Internals: stand-in for large branches to facilitate merging.  
						
						
						
						
					 
					
						2020-05-08 17:00:11 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5f752a5ba9 
					 
					
						
						
							
							Internals: shuffling some sections (2)  
						
						
						
						
					 
					
						2020-05-08 16:30:14 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f466cfc2ca 
					 
					
						
						
							
							Internals: shuffling some sections, added index.  
						
						
						
						
					 
					
						2020-05-08 16:21:00 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						3aa1684129 
					 
					
						
						
							
							Comments  
						
						
						
						
					 
					
						2020-05-08 15:59:59 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						538d28e29e 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 
					
						2020-05-08 00:00:03 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c0d5b3f55a 
					 
					
						
						
							
							Fix to facilitate branch merges  
						
						
						
						
					 
					
						2020-05-07 23:58:35 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						53ebd6a02f 
					 
					
						
						
							
							Metrics: Added Table settings block.  
						
						
						
						
					 
					
						2020-05-07 23:54:32 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						574ff0a280 
					 
					
						
						
							
							Docking, Settings: Allow reload of settings data at runtime. ( #2573 )  
						
						
						
						
					 
					
						2020-05-07 23:28:29 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						51e568f9dc 
					 
					
						
						
							
							Docking: Fix to allow basic reload of non-docking .ini data (following  d33021d8) + moved settings blocks  
						
						
						
						
					 
					
						2020-05-07 23:26:59 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						582f4db59b 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h 
						
						
					 
					
						2020-05-07 22:13:47 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d33021d828 
					 
					
						
						
							
							Settings: Made it possible to load window .ini data mid-frame. Added clear and post-read handlers. ( #2573 )  
						
						
						
						
					 
					
						2020-05-07 21:38:04 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						b6a04d7750 
					 
					
						
						
							
							Settings: Added Clear Settings in Metrics. ( #2188 ) + Preserve last loaded copy in internal buffer used for save (so it can be browsed easily).  
						
						
						
						
					 
					
						2020-05-07 21:38:03 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9ee442d3f0 
					 
					
						
						
							
							Metrics: Added a "Settings" section with some details about persistent ini settings. InputText: Assert early on null buffer.  
						
						
						
						
					 
					
						2020-05-07 21:34:44 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						510f301c9f 
					 
					
						
						
							
							Internals: Removed seemingly unnecessary size_on_first_use arg to CreateNewWindow(), extracted code into ApplyWindowSettings.  
						
						
						
						
					 
					
						2020-05-07 21:34:00 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0679e05677 
					 
					
						
						
							
							Internals: Added code in TempInputScalar() to clamp values, NOT used by stock Drag/Float ( #3209 ,  #1829 ,  #946 ,  #413 )  
						
						
						
						
					 
					
						2020-05-07 12:27:21 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						673d6df85f 
					 
					
						
						
							
							Demo: Clamping font scale. Added helpers in demo. Comments. Update sponsors. ( #3206 )  
						
						
						
						
					 
					
						2020-05-07 11:45:41 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f152fac4f1 
					 
					
						
						
							
							Demo: Wrapped many (not all) code and comments lines to 120 characters to fit below GitHub viewer limit. ( #3193 )  
						
						
						
						
					 
					
						2020-05-05 21:33:16 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						419f905f91 
					 
					
						
						
							
							Demo: Extracted some code out of ShowStyleEditor() into NodeFont().  
						
						
						
						
					 
					
						2020-05-05 19:53:54 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						11a3e75f47 
					 
					
						
						
							
							Backends: Win32: Fix _WIN32_WINNT < 0x0600 (MinGW defaults to 0x502 == Windows 2003). ( #3183 )  
						
						
						
						
					 
					
						2020-05-04 20:46:20 +02:00