omar 
							
						 
					 
					
						
						
							
						
						550dc09998 
					 
					
						
						
							
							Merged from Navigation branch (misc)  
						
						
						
						
							
						
					 
					
						2017-08-29 17:12:18 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						aef041f948 
					 
					
						
						
							
							Merged from Navigation branch  
						
						
						
						
							
						
					 
					
						2017-08-29 17:09:56 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c9298c2657 
					 
					
						
						
							
							Merged from Navigation branch:  
						
						... 
						
						
						
						f71cdd13b7c816e6c742#323 , #246 ) 
					
						2017-08-29 17:09:44 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						287a4b6b38 
					 
					
						
						
							
							Merged from Navigation branch:  5cac4926c8 fix title bar color of window under a modal window.  
						
						
						
						
							
						
					 
					
						2017-08-29 16:52:37 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a9e1d9aab9 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h 
						
						
							
						
					 
					
						2017-08-29 16:21:46 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						358e7a194e 
					 
					
						
						
							
							Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.  
						
						
						
						
							
						
					 
					
						2017-08-29 16:13:17 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						1f1e63f705 
					 
					
						
						
							
							Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. Some code in NewFrame() has been moved around. ( #787 )  
						
						
						
						
							
						
					 
					
						2017-08-29 16:06:52 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ee42fae468 
					 
					
						
						
							
							Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ( #787 )  
						
						
						
						
							
						
					 
					
						2017-08-29 16:05:12 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6752cba4bc 
					 
					
						
						
							
							Removed duplicate comments  
						
						
						
						
							
						
					 
					
						2017-08-29 15:39:11 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						2ee1b70652 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui_internal.h 
						
						
							
						
					 
					
						2017-08-29 15:36:36 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0ba3cadb88 
					 
					
						
						
							
							RenderRectFilledRangeH() can't use cheap acosf() approximation for now. ( #1296 )  
						
						
						
						
							
						
					 
					
						2017-08-29 15:25:05 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f8eef49575 
					 
					
						
						
							
							ProgressBar() fixed rendering when straddling rounded area. ( #1296 )  
						
						
						
						
							
						
					 
					
						2017-08-29 15:23:07 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						01d4bf299a 
					 
					
						
						
							
							Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. ( #1296 ,  #76 )  
						
						
						
						
							
						
					 
					
						2017-08-29 15:22:30 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f0fa17b5e0 
					 
					
						
						
							
							ImDrawList: Minor renaming  
						
						
						
						
							
						
					 
					
						2017-08-29 15:10:03 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7a9ea281be 
					 
					
						
						
							
							ImSwap() helper.  
						
						
						
						
							
						
					 
					
						2017-08-28 19:27:12 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						808d631e35 
					 
					
						
						
							
							imDrawList: PathArcTo() returns when passed zero radius.  
						
						
						
						
							
						
					 
					
						2017-08-28 16:02:25 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e1d81f4dc5 
					 
					
						
						
							
							ImDrawList: Minor tidying up.  
						
						
						
						
							
						
					 
					
						2017-08-28 14:12:55 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						1f51e8f39d 
					 
					
						
						
							
							Internals: Renamed some ImGuiCorner enums.  
						
						
						
						
							
						
					 
					
						2017-08-28 14:11:11 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7a7327adde 
					 
					
						
						
							
							ParseFormatPrecision() returns -1 for scientific noation 'e'/'E', RoundScalar() doesn't alter those.  
						
						
						
						
							
						
					 
					
						2017-08-28 13:19:36 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0d4b08a851 
					 
					
						
						
							
							Added Go binding link  
						
						
						
						
							
						
					 
					
						2017-08-28 12:14:29 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						807322c9a5 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
							
						
					 
					
						2017-08-26 18:43:10 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						b295e185ff 
					 
					
						
						
							
							Updated copyright date for 2017, updated Gallery link  
						
						
						
						
							
						
					 
					
						2017-08-26 16:42:40 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						419b22a487 
					 
					
						
						
							
							Internals: Split some code out of NewFrame() into an Initialize() function.  
						
						
						
						
							
						
					 
					
						2017-08-26 16:35:39 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5938f1ba61 
					 
					
						
						
							
							Added IsMousePosValid() helper.  
						
						
						
						
							
						
					 
					
						2017-08-26 15:18:06 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f72ca6d22c 
					 
					
						
						
							
							ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)  
						
						
						
						
							
						
					 
					
						2017-08-26 14:11:56 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						304de0ee1b 
					 
					
						
						
							
							ImFontConfig: Comments, const.  
						
						
						
						
							
						
					 
					
						2017-08-26 14:11:41 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a02210a455 
					 
					
						
						
							
							Fixed compilation with IMGUI_DISABLE_OBSOLETE_FUNCTIONS defined  
						
						
						
						
							
						
					 
					
						2017-08-26 00:31:44 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						92a6faca6f 
					 
					
						
						
							
							IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.  
						
						
						
						
							
						
					 
					
						2017-08-25 16:43:25 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						37f3a718c6 
					 
					
						
						
							
							Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.  
						
						
						
						
							
						
					 
					
						2017-08-25 16:10:14 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						40f608ce9b 
					 
					
						
						
							
							Version 1.52 WIP  
						
						
						
						
							
						
					 
					
						2017-08-25 15:12:12 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						55a6209931 
					 
					
						
						
							
							Version 1.51  
						
						
						
						
							
 
						
					 
					
						2017-08-25 00:29:59 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e6ed2f9939 
					 
					
						
						
							
							Nav: Tooltip do not appear in navigation focus list. ( #1294 ,  #787 )  
						
						
						
						
							
						
					 
					
						2017-08-25 00:06:57 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						82c3116b4f 
					 
					
						
						
							
							Demo: Displaying version number in test window.  
						
						
						
						
							
						
					 
					
						2017-08-24 17:32:03 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d213c0eb7e 
					 
					
						
						
							
							Style: Tweaked default border (undo half-way from original  c1e1e015c4) ( #707 )  
						
						
						
						
							
						
					 
					
						2017-08-24 17:30:10 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						b0fc30bd19 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						
						
						
							
						
					 
					
						2017-08-22 20:49:02 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7c5556c921 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
							
						
					 
					
						2017-08-22 20:48:36 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						92efa00bc9 
					 
					
						
						
							
							Minor miscellaneous merges from Navigation branch to reduce divergence a little bit  
						
						
						
						
							
						
					 
					
						2017-08-22 20:44:39 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6ed75d3046 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui.h 
						
						
							
						
					 
					
						2017-08-22 20:27:39 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						eb2bbf6f29 
					 
					
						
						
							
							Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit  6be7d4904e  merged from Nav.  
						
						
						
						
							
						
					 
					
						2017-08-22 20:25:27 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						52b39af0a0 
					 
					
						
						
							
							Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref  648f75b245)  
						
						
						
						
							
						
					 
					
						2017-08-22 20:23:46 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6be7d4904e 
					 
					
						
						
							
							Merge part of  88c1966629 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.  
						
						
						
						
							
						
					 
					
						2017-08-22 20:10:02 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						2e35957a81 
					 
					
						
						
							
							Undo reordering of ImGuiKey in Nav branch  
						
						
						
						
							
						
					 
					
						2017-08-22 20:02:52 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						8581050002 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
							
						
					 
					
						2017-08-22 19:55:59 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						141339e4b7 
					 
					
						
						
							
							(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch  
						
						
						
						
							
						
					 
					
						2017-08-22 19:51:12 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						8e89809078 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						
						
						
							
						
					 
					
						2017-08-22 19:48:01 +08:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						2ad2190d47 
					 
					
						
						
							
							Merge  20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch)  
						
						
						
						
							
						
					 
					
						2017-08-22 19:47:52 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f3ab5e6252 
					 
					
						
						
							
							Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) ( #787 ). Thanks @Grouflon  
						
						
						
						
							
						
					 
					
						2017-08-22 19:43:49 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						bea06117bb 
					 
					
						
						
							
							Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. ( #1291 )  
						
						
						
						
							
						
					 
					
						2017-08-22 19:26:21 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ce7f3d4831 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						
						
						
							
						
					 
					
						2017-08-22 18:27:29 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						444792f75f 
					 
					
						
						
							
							Merge fixes from ,master branch  
						
						
						
						
							
						
					 
					
						2017-08-22 18:27:23 +08:00