ocornut
							
						 
					 | 
					
						
						
							
						
						c116dad304
					 | 
					
						
						
							
							Fixed holdng scrollbar creating a small feedback loop with calculation of contents size
						
						
						
						
						
						
					 | 
					
						2015-02-08 13:29:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Václav Patejdl
							
						 
					 | 
					
						
						
							
						
						d135d91e27
					 | 
					
						
						
							
							Added tint_col parameter to ImageButton
						
						
						
						
						
						
					 | 
					
						2015-02-04 19:19:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						209ab823d6
					 | 
					
						
						
							
							Cleanup of previous merge. Moved rarely used Get/Set InternalState functions to the bottom of the list to avoid being misleadnig.
						
						
						
						
						
						
					 | 
					
						2015-02-04 09:43:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e36fad65dd
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/jtilander/imgui into jtilander-master
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp 
						
						
					 | 
					
						2015-02-04 09:30:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4e33787c2f
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-02-04 09:01:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						311c0ca9e5
					 | 
					
						
						
							
							If mouse was first clicked outside of ImGui bounds we also cancel out hovering.
						
						
						
						
						
						
					 | 
					
						2015-02-03 10:35:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						c6de9502f8
					 | 
					
						
						
							
							Avoid requesting IO.WantCaptureMouse if earlier click/hold was outside of ImGui window
						
						
						
						
						
						
					 | 
					
						2015-02-03 09:56:19 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						94c7eddb17
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-02-02 19:50:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						5df28b101d
					 | 
					
						
						
							
							Added ImGuiWindowFlags_NoCollapse flag
						
						
						
						
						
						
					 | 
					
						2015-02-02 09:49:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4169d2c8db
					 | 
					
						
						
							
							Fixed more pedantic warnings
						
						
						
						
						
						
					 | 
					
						2015-02-02 09:06:51 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0a6577a6df
					 | 
					
						
						
							
							Fixed warnings
						
						
						
						
						
						
					 | 
					
						2015-02-02 08:51:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Tilander
							
						 
					 | 
					
						
						
							
						
						e6318abcee
					 | 
					
						
						
							
							Merged changes from original master
						
						
						
						
						
						
					 | 
					
						2015-02-01 09:09:03 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						cc3d41dbab
					 | 
					
						
						
							
							Version number 1.31 wip
						
						
						
						
						
						
					 | 
					
						2015-02-01 14:47:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						85763150e8
					 | 
					
						
						
							
							Fixed / removed unncessary allocation in Render()
						
						
						
						
						
						
					 | 
					
						2015-02-01 14:42:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						bde3f6b90d
					 | 
					
						
						
							
							Removed the dependency on realloc functionality #117 + fixed one alloc in NewFrame()
						
						
						
						
						
						
					 | 
					
						2015-02-01 14:39:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6777145853
					 | 
					
						
						
							
							InputText: Filtering private Unicode range 0xE000-0xF8FF seems like glfw on OSX uses those?
						
						
						
						
						
						
					 | 
					
						2015-02-01 14:08:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Tilander
							
						 
					 | 
					
						
						
							
						
						3478e3a708
					 | 
					
						
						
							
							Enabled us to create the internal state on client side allocated memory, e.g. a heap
						
						
						
						
						
						
					 | 
					
						2015-01-31 21:55:19 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Tilander
							
						 
					 | 
					
						
						
							
						
						1be4604027
					 | 
					
						
						
							
							Fixed pointer dereferencing error from merge
						
						
						
						
						
						
					 | 
					
						2015-01-31 20:35:42 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Tilander
							
						 
					 | 
					
						
						
							
						
						e9ff2f3d24
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/ocornut/imgui
						
						
						
						
						
						
					 | 
					
						2015-01-31 20:31:41 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Tilander
							
						 
					 | 
					
						
						
							
						
						8149bace7b
					 | 
					
						
						
							
							Added a way to replace the internal state pointer so that we can optionally share it between modules (e.g. multiple DLLs)
						
						
						
						
						
						
					 | 
					
						2015-01-31 20:28:24 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Tilander
							
						 
					 | 
					
						
						
							
						
						98e71afa72
					 | 
					
						
						
							
							Removed the dependency on realloc functionality
						
						
						
						
						
						
					 | 
					
						2015-01-31 16:17:39 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						49569a903c
					 | 
					
						
						
							
							Shortened text
						
						
						
						
						
						
					 | 
					
						2015-01-31 23:55:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						2f5c754ef1
					 | 
					
						
						
							
							InputText: process character input before Return because they may come together (IME batch)
						
						
						
						
						
						
					 | 
					
						2015-01-31 23:51:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						bebd2da1f1
					 | 
					
						
						
							
							Wrapping g.ActiveId assignment into a function for easy breakpoint.
						
						
						
						
						
						
					 | 
					
						2015-01-31 22:57:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						3f6091b26b
					 | 
					
						
						
							
							Pedantic grammar fix
						
						
						
						
						
						
					 | 
					
						2015-01-31 21:27:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						a548c9b0d5
					 | 
					
						
						
							
							Version change
						
						
						
						
						
						
					 | 
					
						2015-01-31 19:10:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						ca10c49e27
					 | 
					
						
						
							
							Embedded a mouse cursor that can be drawn for you by setting io.MouseDrawCursor
						
						
						
						
						
						
					 | 
					
						2015-01-31 18:55:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						68bad703ee
					 | 
					
						
						
							
							ImColor::HSV() helper + color buttons demo
						
						
						
						
						
						
					 | 
					
						2015-01-31 17:15:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8d1583d611
					 | 
					
						
						
							
							Added ImColor() inline helper. Image/ImageButton() now takes ImVec4 for consistency and honor window alpha.
						
						
						
						
						
						
					 | 
					
						2015-01-31 16:44:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						cb3b69c879
					 | 
					
						
						
							
							Exposed ColorConvertHSVtoRGB, ColorConvertRGBtoHSV, ColorConvertFloat4ToU32
						
						
						
						
						
						
					 | 
					
						2015-01-31 16:36:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						3cf47988b0
					 | 
					
						
						
							
							Added ImageButton() using regular framing + override framing size (#73)
						
						
						
						
						
						
					 | 
					
						2015-01-31 16:21:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						2ecc285919
					 | 
					
						
						
							
							ImDrawList::AddCallback() allows for custom rendering (e.g. 3D scene inside a imgui widget))
						
						
						
						
						
						
					 | 
					
						2015-01-31 15:24:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						82666cdc57
					 | 
					
						
						
							
							ShowTestWindow() early out if window is collapsed. Drawing the 2 columns example differently.
						
						
						
						
						
						
					 | 
					
						2015-01-31 10:20:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4437293b79
					 | 
					
						
						
							
							Added ImDrawList::SplitDrawCmd() to force multiple draw calls for depending rendering/blending + Comments
						
						
						
						
						
						
					 | 
					
						2015-01-31 09:51:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						64679a0b03
					 | 
					
						
						
							
							ImFontAtlas::Build() does a sanity memset on glyph rectangles.
						
						
						
						
						
						
					 | 
					
						2015-01-29 17:44:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4c4bbcb451
					 | 
					
						
						
							
							Examples: fixed custom rendering example canvas size.
						
						
						
						
						
						
					 | 
					
						2015-01-29 15:04:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						27161d2a98
					 | 
					
						
						
							
							Added io.DisplayVisibleMin / io.DisplayVisibleMax to allow for virtual / scrolling display.
						
						
						
						
						
						
						
						+ remove duplicated "Setup outer clipping rectangle" block in Begin)) 
						
						
					 | 
					
						2015-01-29 14:20:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						962ef3924a
					 | 
					
						
						
							
							Added extra asserts and tweaked code in Begin()
						
						
						
						
						
						
					 | 
					
						2015-01-29 14:07:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						79042a3a3c
					 | 
					
						
						
							
							GetVoidPtr() functions like GetInt, GetFloat. Renamed GetIntPtr/GetFloatPtr to GetIntRef/GetFloatRef
						
						
						
						
						
						
					 | 
					
						2015-01-29 10:22:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Collin
							
						 
					 | 
					
						
						
							
						
						c9c41c3874
					 | 
					
						
						
							
							Added Set/GetVoidPtr in ImGuiStorage
						
						
						
						
						
						
					 | 
					
						2015-01-28 21:31:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						00842d18e4
					 | 
					
						
						
							
							Speculative GCC warning fix (again)
						
						
						
						
						
						
					 | 
					
						2015-01-24 11:30:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4535f5f899
					 | 
					
						
						
							
							Fixed some warnings with Clang/GCC
						
						
						
						
						
						
					 | 
					
						2015-01-24 11:18:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						638babb0dd
					 | 
					
						
						
							
							Examples: added simple drawing app example for using ImDrawList and custom drawing
						
						
						
						
						
						
					 | 
					
						2015-01-23 01:38:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						32b8ad7381
					 | 
					
						
						
							
							Fixed mouse aiming within InputText() - broken during 01/18 merge
						
						
						
						
						
						
					 | 
					
						2015-01-23 00:02:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7530f3c985
					 | 
					
						
						
							
							Added IsItemActive() - replace IsItemFocused()
						
						
						
						
						
						
						
						ClipAdvance() --> ItemAdd() - nb: return value is inverted 
						
						
					 | 
					
						2015-01-22 23:54:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						70188c5623
					 | 
					
						
						
							
							Added comments
						
						
						
						
						
						
					 | 
					
						2015-01-22 11:03:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f1ccd32cb1
					 | 
					
						
						
							
							stb_truetype: implementation is now static + submitted PR to origin.
						
						
						
						
						
						
					 | 
					
						2015-01-21 23:45:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						26174cba85
					 | 
					
						
						
							
							Added InvisibleButton()
						
						
						
						
						
						
					 | 
					
						2015-01-21 23:03:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						dbffbacaf6
					 | 
					
						
						
							
							Added IMGUI_DISABLE_STB_***_IMPLEMENTATION
						
						
						
						
						
						
					 | 
					
						2015-01-21 11:59:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						26f93e6660
					 | 
					
						
						
							
							IMGUI_STB_NAMESPACE define Stb stuff in a namespace (trying stuff to reduce problems with multiple implementations)
						
						
						
						
						
						
					 | 
					
						2015-01-21 11:54:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |