omar 
							
						 
					 
					
						
						
							
						
						8691b56136 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						
						
						
					 
					
						2019-02-12 10:30:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						169e3981fd 
					 
					
						
						
							
							Examples: OpenGL2: Added #define GL_SILENCE_DEPRECATION to cope with newer XCode warnings.  
						
						 
						
						
						
						
					 
					
						2019-02-11 19:09:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						2cada3c143 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_widgets.cpp 
						
						
					 
					
						2019-02-11 18:59:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						d16dbc5b87 
					 
					
						
						
							
							Examples: SDL: Using the SDL_WINDOW_ALLOW_HIGHDPI flag. ( #2306 ,  #1676 ) [@rasky]  
						
						 
						
						
						
						
					 
					
						2019-02-11 18:52:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						a79785c0b9 
					 
					
						
						
							
							ImDrawData: Added FramebufferScale field (currently a copy of the value from io.DisplayFramebufferScale).  
						
						 
						
						... 
						
						
						
						This is to allow render functions being written without pulling any data from ImGuiIO, allowing incoming multi-viewport feature to behave on Retina display and with multiple displays. If you are not using a custom binding, please update your render function code ahead of time, and use draw_data->FramebufferScale instead of io.DisplayFramebufferScale. (#2306 , #1676 )
Examples: Metal, OpenGL2, OpenGL3: Fixed offsetting of clipping rectangle with ImDrawData::DisplayPos != (0,0) when the display frame-buffer scale scale is not (1,1). While this doesn't make a difference when using master branch, this is effectively fixing support for multi-viewport with Mac Retina Displays on those examples. (#2306 ) Also using ImDrawData::FramebufferScale instead of io.DisplayFramebufferScale.
Examples: Clarified the use the ImDrawData::DisplayPos to offset clipping rectangles. 
						
						
					 
					
						2019-02-11 18:52:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						afc36cf802 
					 
					
						
						
							
							Window: Fixed initial width of collapsed windows not taking account of contents width (broken in 1.67). ( #2336 ,  #176 )  
						
						 
						
						
						
						
					 
					
						2019-02-08 14:34:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						1b63ded8fa 
					 
					
						
						
							
							Tabs: Fixed border (when enabled) so it is aligned correctly mid-pixel and appears as bright as other borders.  
						
						 
						
						
						
						
					 
					
						2019-02-07 12:07:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						4a3a895be9 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp 
						
						
					 
					
						2019-02-06 14:47:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						29d38b59d0 
					 
					
						
						
							
							ListBox/InputTextMultiline: Better optimized when clipped / non-visible.  
						
						 
						
						
						
						
					 
					
						2019-02-06 14:46:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						5bdc7d7a6f 
					 
					
						
						
							
							Menus: Tweaked horizontal overlap between parent and child menu (to help convey relative depth) from using style.ItemSpacing.x to style.ItemInnerSpacing.x, the later being expected to be smaller. ( #1086 )  
						
						 
						
						
						
						
					 
					
						2019-02-06 12:32:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						e3dd95d335 
					 
					
						
						
							
							Added IsItemActivated() as an extension to the IsItemDeactivated/IsItemDeactivatedAfterEdit functions which are useful to implement variety of undo patterns. ( #820 ,  #956 ,  #1875 )  
						
						 
						
						
						
						
					 
					
						2019-02-06 11:52:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						c59611a3b3 
					 
					
						
						
							
							InputText: Fixed redo buffer exhaustion handling (rare) which could corrupt the undo character buffer. ( #2333 )  
						
						 
						
						
						
						
					 
					
						2019-02-05 23:38:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						5a95c77388 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/ocornut/imgui  
						
						 
						
						
						
						
					 
					
						2019-02-05 13:53:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						be107ba8f8 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui_internal.h
#	imgui_widgets.cpp 
						
						
					 
					
						2019-02-05 13:52:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						d38f4dc143 
					 
					
						
						
							
							Tabs: Non-docking tab bars are storing names to allow tab list button + whole style scaling. Added ImGuiTabBarFlags_TabListPopupButton flag to show a popup button on manual tab bars. Locking FramePadding for the scope of a tab-bar to avoid sheering/clipping of tab item. Made scaling of tab ellipsis less awkward. ( #261 ,  #351 )  
						
						 
						
						
						
						
					 
					
						2019-02-05 13:23:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						65c972e9e4 
					 
					
						
						
							
							Update README.md  
						
						 
						
						
						
						
					 
					
						2019-02-05 11:45:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						f7c879eb60 
					 
					
						
						
							
							RadioButton: Fixed label horizontal alignment to precisely match Checkbox(). + Internals: Checkbox, RadioButton: Single call to ItemSize() for flow layout purpose.  
						
						 
						
						
						
						
					 
					
						2019-02-04 23:34:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						7227454dca 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui.h 
						
						
					 
					
						2019-02-03 17:31:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						e215809c4d 
					 
					
						
						
							
							Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).  
						
						 
						
						
						
						
					 
					
						2019-02-01 17:06:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						ac6d474103 
					 
					
						
						
							
							Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).  
						
						 
						
						
						
						
					 
					
						2019-02-01 16:37:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						5fc6899dc2 
					 
					
						
						
							
							Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). ( #2329 ) [@BrutPitt]  
						
						 
						
						
						
						
					 
					
						2019-02-01 15:13:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						f906d53f7d 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 
					
						2019-01-31 19:19:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						16c0a0217c 
					 
					
						
						
							
							Updating supporter list.  
						
						 
						
						
						
						
					 
					
						2019-01-31 13:45:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						fb4f1ff7f6 
					 
					
						
						
							
							InputText: Fixed a bug where ESCAPE would be first captured by the Keyboard Navigation code. ( #2321 ,  #787 )  
						
						 
						
						
						
						
					 
					
						2019-01-30 15:16:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						158995f271 
					 
					
						
						
							
							InputText: Fixed a bug where ESCAPE would not restore the initial value in all situations. ( #2321 ) [@relick]  
						
						 
						
						
						
						
					 
					
						2019-01-30 13:15:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						2ccc6d2ed1 
					 
					
						
						
							
							Docking: Exposing extra flag in Configuration panel. Moved some forgotten Changelog entries at the right place.  
						
						 
						
						
						
						
					 
					
						2019-01-29 18:28:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						ed240c910b 
					 
					
						
						
							
							Demo: Fixed "Log" demo not initializing properly, leading to the first line not showing before a Clear. ( #2318 ) [@bluescan]  
						
						 
						
						
						
						
					 
					
						2019-01-29 14:36:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						8a4422b2fa 
					 
					
						
						
							
							Fixed CloseCurrentPopup() on a child-menu of a modal incorrectly closing the modal. ( #2308 )  
						
						 
						
						
						
						
					 
					
						2019-01-27 23:54:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc-Alexandre Espiaut 
							
						 
					 
					
						
						
							
						
						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. 
						
						
					 
					
						2019-01-27 21:59:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						13a5f5ba8b 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 
					
						2019-01-27 16:46:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						b26ac92a12 
					 
					
						
						
							
							Revert "Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages)."  
						
						 
						
						... 
						
						
						
						This reverts commit 20bc06af70 . 
						
						
					 
					
						2019-01-27 16:43:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						20bc06af70 
					 
					
						
						
							
							Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages).  
						
						 
						
						
						
						
					 
					
						2019-01-27 16:18:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						737a3644fc 
					 
					
						
						
							
							Removed trailing spaces (docking branch)  
						
						 
						
						
						
						
					 
					
						2019-01-27 14:57:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						e55678adec 
					 
					
						
						
							
							Update README.md (changed e-mail address)  
						
						 
						
						
						
						
					 
					
						2019-01-24 18:31:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						a8277ca873 
					 
					
						
						
							
							Reoder Python bindings  
						
						 
						
						
						
						
					 
					
						2019-01-23 20:04:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						07ff47bf1b 
					 
					
						
						
							
							Docking: Fixed various border / padding related inconsistency with dock node vs floating windows. ( #2109 )  
						
						 
						
						
						
						
					 
					
						2019-01-23 19:54:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						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 )  
						
						 
						
						
						
						
					 
					
						2019-01-23 19:24:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						c362a96a3f 
					 
					
						
						
							
							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 )  
						
						 
						
						
						
						
					 
					
						2019-01-23 19:21:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						0947fa3de0 
					 
					
						
						
							
							Merge branch 'viewport' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 
					
						2019-01-21 16:54:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						cb9a6b8a8b 
					 
					
						
						
							
							Merge branch 'master' into viewport  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	examples/README.txt
#	imgui.cpp 
						
						
					 
					
						2019-01-21 16:52:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						f14f93ef6e 
					 
					
						
						
							
							Fixed range-version of PushID() and GetID() not honoring the ### operator to restart from the seed value.  
						
						 
						
						
						
						
					 
					
						2019-01-21 16:50:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						ea7206fd4f 
					 
					
						
						
							
							Fixed using imgui_freetype.cpp in unity builds. ( #2302 )  
						
						 
						
						
						
						
					 
					
						2019-01-21 13:58:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						54ba8a643e 
					 
					
						
						
							
							Removed trailing spaces from text files. ( #2038 ,  #2299 )  
						
						 
						
						
						
						
					 
					
						2019-01-20 22:23:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						00ffdb9fa9 
					 
					
						
						
							
							ImGuiTextBuffer: Added append() function (unformatted).  
						
						 
						
						
						
						
					 
					
						2019-01-20 22:21:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						f94af2f5c5 
					 
					
						
						
							
							Merge branch 'viewport' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_draw.cpp 
						
						
					 
					
						2019-01-20 22:13:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						8079344cee 
					 
					
						
						
							
							Merge branch 'master' into viewport  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_vulkan.h
#	imgui.cpp 
						
						
					 
					
						2019-01-20 22:12:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Mast 
							
						 
					 
					
						
						
							
						
						8a63c72ac4 
					 
					
						
						
							
							Fix the year for screenshot gallery part 7 and 8 links ( #2298 )  
						
						 
						
						
						
						
					 
					
						2019-01-19 20:45:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						82e31d34f0 
					 
					
						
						
							
							Merge branch 'master' into viewport  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	examples/imgui_impl_win32.cpp 
						
						
					 
					
						2019-01-18 12:31:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						92d29531fa 
					 
					
						
						
							
							Qt links  
						
						 
						
						
						
						
					 
					
						2019-01-18 11:34:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								omar 
							
						 
					 
					
						
						
							
						
						b8020032f9 
					 
					
						
						
							
							Examples: Win32: Added support for mouse buttons 4 and 5 via WM_XBUTTON* messages. ( #2264 )  
						
						 
						
						
						
						
					 
					
						2019-01-17 16:55:23 +01:00