omar 
							
						 
					 
					
						
						
							
						
						08b72eb5c0 
					 
					
						
						
							
							IsWindowFocused() refactor will flags. ( #1382 )  
						
						... 
						
						
						
						Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow).
Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows). 
						
						
					 
					
						2017-12-12 14:07:12 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						fa179d0ad8 
					 
					
						
						
							
							Reordered ImGuiHoveredFlags to match upcoming ImGuiFocusedFlags ( #1382 )  
						
						
						
						
					 
					
						2017-12-12 12:52:24 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4a555d35f0 
					 
					
						
						
							
							IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ( #1382 )  
						
						
						
						
					 
					
						2017-12-12 12:50:42 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						185c1eaaf3 
					 
					
						
						
							
							Alignment + removed comments  
						
						
						
						
					 
					
						2017-12-11 22:55:28 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f93945540f 
					 
					
						
						
							
							Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 ,  #1330 )  
						
						
						
						
					 
					
						2017-12-11 22:42:12 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6b168b43ff 
					 
					
						
						
							
							Comments ( #822 )  
						
						
						
						
					 
					
						2017-12-11 19:47:23 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						2b9d8ab91d 
					 
					
						
						
							
							Merge branch 'master' into drag_and_drop  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui.h 
						
						
					 
					
						2017-12-11 16:39:27 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f06f68f3ce 
					 
					
						
						
							
							Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016)  
						
						
						
						
					 
					
						2017-12-11 16:22:52 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9fd15defe4 
					 
					
						
						
							
							Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ( #787 )  
						
						
						
						
					 
					
						2017-12-11 16:19:37 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						1096e14356 
					 
					
						
						
							
							ImFont: Added GetDebugName() helper.  
						
						
						
						
					 
					
						2017-12-10 18:34:32 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e3e0326ea9 
					 
					
						
						
							
							Exposed BeginCombo() publicly.  
						
						
						
						
					 
					
						2017-12-10 18:08:59 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						080f61858f 
					 
					
						
						
							
							Sorted typedefs/enumations forward declarations in imgui.h  
						
						
						
						
					 
					
						2017-12-10 17:57:27 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						eab6333a0b 
					 
					
						
						
							
							SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) ( #1490 )  
						
						
						
						
					 
					
						2017-12-10 17:36:30 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0872020c5c 
					 
					
						
						
							
							Comments  
						
						
						
						
					 
					
						2017-12-10 16:11:29 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f72b002da8 
					 
					
						
						
							
							Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete).  ( #246 ,  #519 ,  #1444 )  
						
						
						
						
					 
					
						2017-12-10 16:05:47 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c9f0275e22 
					 
					
						
						
							
							Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.  
						
						
						
						
					 
					
						2017-12-08 18:32:12 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7bf85db6c4 
					 
					
						
						
							
							Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h ( #143 )  
						
						
						
						
					 
					
						2017-12-08 12:48:53 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						97edd42fc0 
					 
					
						
						
							
							Indent(), Unindent(): Allow passing negative values.  
						
						
						
						
					 
					
						2017-12-07 21:14:25 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						94bf12f14b 
					 
					
						
						
							
							Demo: Display better mouse cursor info for debugging backends.  
						
						
						
						
					 
					
						2017-12-07 13:27:49 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						20c7aab60c 
					 
					
						
						
							
							Exposed GetOverlayDrawList(). (~#545, ~#530)  
						
						
						
						
					 
					
						2017-12-07 12:49:52 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						3b7e4eaf38 
					 
					
						
						
							
							Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )  
						
						
						
						
					 
					
						2017-12-06 15:13:45 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						90ae1c59c4 
					 
					
						
						
							
							Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled).  ( #822 )  
						
						
						
						
					 
					
						2017-12-06 15:13:45 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						63712d5f5c 
					 
					
						
						
							
							Merge branch 'master' into drag_and_drop  
						
						
						
						
					 
					
						2017-11-28 17:28:45 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4c4f1b0224 
					 
					
						
						
							
							ImVector: Added ImVector::push_front helper.  
						
						
						
						
					 
					
						2017-11-28 10:49:43 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						532f564fd3 
					 
					
						
						
							
							ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().  
						
						
						
						
					 
					
						2017-11-27 19:02:00 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d9c5d72962 
					 
					
						
						
							
							ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.  
						
						
						
						
					 
					
						2017-11-24 16:56:17 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						3f5b2a3fe3 
					 
					
						
						
							
							Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).  
						
						
						
						
					 
					
						2017-11-20 13:53:16 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						31683cfe34 
					 
					
						
						
							
							ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. ( #845 )  
						
						
						
						
					 
					
						2017-11-20 13:31:40 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ba095f81a5 
					 
					
						
						
							
							Merge branch '2016-08-rounded-image' of  https://github.com/thedmd/imgui  into thedmd-2016-08-rounded-image  
						
						
						
						
					 
					
						2017-11-20 13:07:14 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						8c0f2e4946 
					 
					
						
						
							
							Added comment to help people dealing with  58345b11e1 breakage ( #707 )  
						
						
						
						
					 
					
						2017-11-20 13:05:50 +01:00 
						 
				 
			
				
					
						
							
							
								thedmd 
							
						 
					 
					
						
						
							
						
						79f07f6ff0 
					 
					
						
						
							
							Add AddImageRounded() to ImDrawList  
						
						
						
						
					 
					
						2017-11-19 21:56:46 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						92212b17aa 
					 
					
						
						
							
							Merge branch 'master' into drag_and_drop  
						
						
						
						
					 
					
						2017-11-19 16:23:37 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						abbf836fd0 
					 
					
						
						
							
							Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. ( #707 ,  fix   #819 ,  #1031 , ref  #1019 , ref  #447 )  
						
						
						
						
					 
					
						2017-11-19 15:56:51 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c433bc971f 
					 
					
						
						
							
							Reorder fields for consistency.  
						
						
						
						
					 
					
						2017-11-19 14:58:10 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						39137ccc3e 
					 
					
						
						
							
							Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ( #707 )  
						
						
						
						
					 
					
						2017-11-19 13:52:40 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9886b09a0a 
					 
					
						
						
							
							Minor tweak, removed extraneous empty destructor.  
						
						
						
						
					 
					
						2017-11-19 12:42:17 +01:00 
						 
				 
			
				
					
						
							
							
								Jason Wilkins 
							
						 
					 
					
						
						
							
						
						e605f21797 
					 
					
						
						
							
							TreePush with zero arguments was ambiguous. Resolved by making it call TreePush(const void*)  
						
						
						
						
					 
					
						2017-11-19 12:36:14 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9a44d447cd 
					 
					
						
						
							
							NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. ( #1423  etc.)  
						
						
						
						
					 
					
						2017-11-19 12:06:45 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4022ada843 
					 
					
						
						
							
							Merge branch 'master' into drag_and_drop  
						
						
						
						
					 
					
						2017-11-19 00:36:32 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4daf377c9b 
					 
					
						
						
							
							Added comment about TextUnformatted(). ( #1450 )  
						
						
						
						
					 
					
						2017-11-19 00:32:47 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d7af1a218e 
					 
					
						
						
							
							Style: Added PopupRounding setting. ( #1112 )  
						
						
						
						
					 
					
						2017-11-19 00:29:29 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0a61b7195c 
					 
					
						
						
							
							Style: Added a default StyleColorsLight(). ( #707 )  
						
						
						
						
					 
					
						2017-11-19 00:29:29 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						58345b11e1 
					 
					
						
						
							
							Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. ( #707 )  
						
						
						
						
					 
					
						2017-11-18 23:44:16 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						bd4bc929ce 
					 
					
						
						
							
							Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.  
						
						
						
						
					 
					
						2017-11-18 18:28:21 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7746dd104c 
					 
					
						
						
							
							Merge branch 'master' into drag_and_drop  
						
						
						
						
					 
					
						2017-11-16 13:28:22 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f5bdf443c9 
					 
					
						
						
							
							Minor comments, tweaks  
						
						
						
						
					 
					
						2017-11-15 22:37:43 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ae060b1d67 
					 
					
						
						
							
							Merge branch 'master' into drag_and_drop  
						
						
						
						
					 
					
						2017-11-15 10:24:54 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ffad688fc8 
					 
					
						
						
							
							Drag and Drop: Added payload->IsPreview() to user can render their custom preview while handling overlapping drop targets. ( #143 )  
						
						
						
						
					 
					
						2017-11-14 22:11:43 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						30bf40195b 
					 
					
						
						
							
							io.OptNoCursorBlink -> io.OptCursorBlink ( #1427 )  
						
						
						
						
					 
					
						2017-11-12 16:06:44 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						669498ff26 
					 
					
						
						
							
							Added io.OptNoCursorBlink option to disable cursor blinking. ( #1427 ). Renamed io.OSXBehaviors to io.OptMacOSXBehaviors. Should affect users as the compile-time default is usually enough. ( #473 ,  #650 )  
						
						
						
						
					 
					
						2017-11-12 16:03:09 +01:00