ocornut
							
						 
					 | 
					
						
						
							
						
						92b61d2ee4
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
					 | 
					
						2015-07-06 21:47:09 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						b92396b46a
					 | 
					
						
						
							
							Optimisation, removed the duplicate ClipRectStack in ImGuiWindow, storing single value
						
						
						
						
						
						
					 | 
					
						2015-07-06 21:46:12 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6a22835f63
					 | 
					
						
						
							
							AA branch: ImDrawList: rename commands to cmd_buffer
						
						
						
						
						
						
						
						Not strictly necessary but while we're doing minor breakage let's do
them at all once. 
						
						
					 | 
					
						2015-07-06 21:09:05 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e7e2fcdd19
					 | 
					
						
						
							
							ImRect (internal) made constructors more non-optimised compilation friendly
						
						
						
						
						
						
					 | 
					
						2015-07-06 20:59:01 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						a17e47fe14
					 | 
					
						
						
							
							ImDrawList: fixed non-merged commands when equal clip rectangles are in the two first commands
						
						
						
						
						
						
					 | 
					
						2015-07-06 20:38:06 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						5782c69c2a
					 | 
					
						
						
							
							Metrics window: calculate bounding box of actual vertices when hovering a draw list.
						
						
						
						
						
						
					 | 
					
						2015-07-06 16:34:41 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						9db4b35168
					 | 
					
						
						
							
							Fixed ImRect.Add(ImVec2&) which was broken and somehow unused
						
						
						
						
						
						
					 | 
					
						2015-07-06 11:13:05 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0ff2a6ff64
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
						
						Conflicts:
	imgui.cpp 
						
						
					 | 
					
						2015-07-06 10:56:50 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d6987d1586
					 | 
					
						
						
							
							ImDrawList store pointer to their owner name for easier auditing/debugging. Metrics windows render clip rectangle when hovering.
						
						
						
						
						
						
					 | 
					
						2015-07-06 10:52:49 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						c52cefa2c2
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
					 | 
					
						2015-07-05 22:27:50 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0d5e6e125c
					 | 
					
						
						
							
							Documentation (#133 #254)
						
						
						
						
						
						
					 | 
					
						2015-07-05 22:26:01 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0676efd37f
					 | 
					
						
						
							
							AA branch: added ImDrawData::DeIndexAllBuffers() helper (#254)
						
						
						
						
						
						
					 | 
					
						2015-07-05 22:09:55 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						b2b616be00
					 | 
					
						
						
							
							AA branch: ImDrawCmd idx_count -> elem_count
						
						
						
						
						
						
					 | 
					
						2015-07-05 22:09:15 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f3303fa84f
					 | 
					
						
						
							
							AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254)
						
						
						
						
						
						
					 | 
					
						2015-07-05 22:03:46 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						2633325b9f
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-07-05 21:55:24 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						562aecdaa5
					 | 
					
						
						
							
							Removed obsolete GetDefaultFontData() function that would assert anyway (obsoleted 2015/01/11)
						
						
						
						
						
						
					 | 
					
						2015-07-05 20:56:01 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						3fa4451936
					 | 
					
						
						
							
							PlotLines(), PlotHistogram(): fixed incorrect hovering test (would trigger tooltip when menu is open)
						
						
						
						
						
						
					 | 
					
						2015-07-05 20:47:25 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						1c160adbba
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-07-05 20:38:18 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						c9676554b9
					 | 
					
						
						
							
							MenuItem() can be activated on release (#245)
						
						
						
						
						
						
					 | 
					
						2015-07-05 20:27:06 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8b4a470e1d
					 | 
					
						
						
							
							Examples: DirectX9: fixed size passed to vertex and index buffer Lock() + readjust default buffer sizes.
						
						
						
						
						
						
					 | 
					
						2015-07-05 19:24:26 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						56553f33b8
					 | 
					
						
						
							
							AA branch: added style.AntiAliasedLines, style.AntiAliasedShapes (#133)
						
						
						
						
						
						
					 | 
					
						2015-07-05 19:09:53 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						19e59421e5
					 | 
					
						
						
							
							AA branch: comments, inlining minor ops
						
						
						
						
						
						
					 | 
					
						2015-07-05 18:42:41 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						46c440d186
					 | 
					
						
						
							
							AA branch: AddPolyline() stores normals on stack
						
						
						
						
						
						
					 | 
					
						2015-07-05 18:19:22 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						c09af38804
					 | 
					
						
						
							
							AA branch: AddConvexPolyFilled() store normals on stack
						
						
						
						
						
						
					 | 
					
						2015-07-05 18:05:55 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						a74ca9025f
					 | 
					
						
						
							
							AA branch: oops, ImInvLengthSqr() is ImInvLength()
						
						
						
						
						
						
					 | 
					
						2015-07-05 17:37:55 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						a8b5f77591
					 | 
					
						
						
							
							AA branch: AddPolyline(), AddConvexPolyFilled() a little more readable with more consistent naming
						
						
						
						
						
						
					 | 
					
						2015-07-05 17:36:07 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0292c82b9c
					 | 
					
						
						
							
							AA branch: fix lower-right bound of frame outlines
						
						
						
						
						
						
					 | 
					
						2015-07-05 16:52:06 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						2f21347803
					 | 
					
						
						
							
							CollapsingHeader() fixed label rendering outside in columns context where cliprect max isn't aligned with header
						
						
						
						
						
						
					 | 
					
						2015-07-05 16:37:49 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7959fbe992
					 | 
					
						
						
							
							AA branch: CollapsingHeader() rounding down half window padding
						
						
						
						
						
						
					 | 
					
						2015-07-05 16:35:41 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f04c2002d6
					 | 
					
						
						
							
							AA branch: fixed column offsets not always aligned to the pixel causing CollapsingHeader() border to incorrectly anti-alias
						
						
						
						
						
						
						
						Fixing framed CollapsingHeader() inside columns, where
GetContentRegionMax() doesn't return pixel aligned rounded position. 
						
						
					 | 
					
						2015-07-05 16:32:26 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0d7ca3da24
					 | 
					
						
						
							
							AA branch: AddLine() api adds the 0.5f offset (unsure about that yet)
						
						
						
						
						
						
					 | 
					
						2015-07-05 16:24:55 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						18fa8e1c7e
					 | 
					
						
						
							
							Fixed IsMouseDragging() (fix #260)
						
						
						
						
						
						
					 | 
					
						2015-07-04 16:46:30 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						61e551e0ee
					 | 
					
						
						
							
							AA branch: fixed warning
						
						
						
						
						
						
					 | 
					
						2015-07-04 13:41:51 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						3b94c37efc
					 | 
					
						
						
							
							AA branch: minor tweaks + disabled debug code that disable AA when holding Ctrl
						
						
						
						
						
						
					 | 
					
						2015-07-04 12:59:55 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f435e42561
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
						
						Conflicts:
	examples/opengl_example/imgui_impl_glfw.cpp 
						
						
					 | 
					
						2015-07-04 12:44:25 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d76bc3434e
					 | 
					
						
						
							
							Added DragFloatRange2() DragIntRange2() helpers (#76)
						
						
						
						
						
						
					 | 
					
						2015-07-04 12:17:11 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						a33810d652
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2015-07-03 16:08:00 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						e9b81dd5ab
					 | 
					
						
						
							
							Comments
						
						
						
						
						
						
					 | 
					
						2015-07-03 15:32:10 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						fd3c6067bf
					 | 
					
						
						
							
							Add conditional #ifdef prior to imconfig.h to facilitate inclusion in build systems (#255)
						
						
						
						
						
						
					 | 
					
						2015-07-03 15:31:54 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						7437b43b2d
					 | 
					
						
						
							
							Fixed warnings for more pedantic settings (#258)
						
						
						
						
						
						
					 | 
					
						2015-07-03 08:15:56 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						b69d7d9df3
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
						
						
						
						
						
						
					 | 
					
						2015-07-02 21:47:48 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						2f03511062
					 | 
					
						
						
							
							Added ImGuiKey_PageUp, ImGuiKey_PageDown for user.
						
						
						
						
						
						
					 | 
					
						2015-07-02 21:43:07 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6826ab3ffd
					 | 
					
						
						
							
							Added GetKeyIndex() helper.
						
						
						
						
						
						
					 | 
					
						2015-07-02 21:32:29 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						0f9e2f8173
					 | 
					
						
						
							
							Tweaked scrolling example code (#150)
						
						
						
						
						
						
					 | 
					
						2015-07-02 21:22:16 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						42efc29def
					 | 
					
						
						
							
							SetScrollFromCursorPos() -> SetScrollHere() (#150) final call !
						
						
						
						
						
						
					 | 
					
						2015-07-02 21:03:15 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4eba6cd470
					 | 
					
						
						
							
							Added SetScrollY(), SetScrollFromPosY(). Renamed SetScrollPosHere() to SetScrollFromCursorPos(). (#150)
						
						
						
						
						
						
					 | 
					
						2015-07-02 20:53:45 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						b54cb1c24c
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/ocornut/imgui
						
						
						
						
						
						
					 | 
					
						2015-07-02 20:49:36 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						b37a326163
					 | 
					
						
						
							
							Renamed GetScrollPosY() to GetScrollY(). (#150)
						
						
						
						
						
						
						
						Necessary to reduce confusion along with other scrolling functions,
because positions (e.g. cursor position) are not equivalent to scrolling
amount. 
						
						
					 | 
					
						2015-07-02 20:47:04 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5d59e965f6
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2015-07-02 15:42:19 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						7bd28d17ca
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2015-07-02 15:35:55 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |