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 
							
						 
					 
					
						
						
							
						
						bc78535bbf 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/ggtucker/imgui  into ggtucker-master  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui.h 
						
						
					 
					
						2017-08-20 18:22:34 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						1065a7b95b 
					 
					
						
						
							
							ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)  
						
						
						
						
					 
					
						2017-08-20 15:38:05 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						8be7a60f20 
					 
					
						
						
							
							ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )  
						
						
						
						
					 
					
						2017-08-17 21:19:54 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						1086c87767 
					 
					
						
						
							
							ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )  
						
						
						
						
					 
					
						2017-08-17 21:13:14 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4075cc58e9 
					 
					
						
						
							
							ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype ( #618 )  
						
						
						
						
					 
					
						2017-08-17 20:44:44 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d970957e2d 
					 
					
						
						
							
							ImFontAtlas: Draft of an api to submit custom rectangle (not exposed). Atlas default texture chunk using it. (WIP: we are still storing mouse UV outside in GImGui)  
						
						
						
						
					 
					
						2017-08-17 19:36:48 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						24a78767d2 
					 
					
						
						
							
							Merge branch 'master' into styles  
						
						... 
						
						
						
						# Conflicts:
#	TODO.txt 
						
						
					 
					
						2017-08-17 17:24:33 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4a7e1ff4d4 
					 
					
						
						
							
							ImFontAtlas: Some shallow renaming + added an assert for clarification  
						
						
						
						
					 
					
						2017-08-17 15:35:59 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0be4f66d89 
					 
					
						
						
							
							ImFontAtlas: Shuffling some code inside Build() to make upcoming diffs less confusing (nb: we might break compat with forks of Build() like  #618 )  
						
						
						
						
					 
					
						2017-08-17 11:46:25 +08:00 
						 
				 
			
				
					
						
							
							
								James Wallis 
							
						 
					 
					
						
						
							
						
						9239e91dc9 
					 
					
						
						
							
							Whitespace fix to previous  
						
						
						
						
					 
					
						2017-08-15 14:12:32 +01:00 
						 
				 
			
				
					
						
							
							
								James Wallis 
							
						 
					 
					
						
						
							
						
						718f00d651 
					 
					
						
						
							
							Make font atlas packing padding configurable  
						
						
						
						
					 
					
						2017-08-15 14:11:04 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						18b50f8eba 
					 
					
						
						
							
							Comments  
						
						
						
						
					 
					
						2017-08-15 11:41:36 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f8f382221c 
					 
					
						
						
							
							ImVector: added resize() variant with initialization value  
						
						
						
						
					 
					
						2017-08-15 11:41:00 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7b7845d764 
					 
					
						
						
							
							ImFont::CalcWordWrapPositionA: minor optimization  
						
						
						
						
					 
					
						2017-08-14 21:00:44 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d258287c92 
					 
					
						
						
							
							Revert  d2c219d  #826  + tidying up ImFont::RenderChar()  
						
						
						
						
					 
					
						2017-08-14 16:53:38 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d2c219df84 
					 
					
						
						
							
							Merge pull request  #826  from swetland/patch  
						
						... 
						
						
						
						ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query 
						
						
					 
					
						2017-08-14 16:50:20 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6a4064e5f2 
					 
					
						
						
							
							PathArcToFast: Minor renaming for clarification. Comments.  
						
						
						
						
					 
					
						2017-08-14 12:25:35 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4fd148f4f9 
					 
					
						
						
							
							Added ImFontAtlas::GlyphRangesBuilder helper + doc  
						
						
						
						
					 
					
						2017-08-09 22:42:03 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e63ebd997f 
					 
					
						
						
							
							Use ~IM_COL32_A_MASK instead of IM_COL32(255,255,255,0)  
						
						
						
						
					 
					
						2017-07-31 12:25:27 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						df56879883 
					 
					
						
						
							
							imDrawList::PathRect() uses ImGuiCorner_ enums. Should fully promote this to imgui.h at some point.  
						
						
						
						
					 
					
						2017-07-26 14:53:15 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						1987e23ce5 
					 
					
						
						
							
							ImDrawList::PrimReserve() minor renaming of locals to make things clearer  
						
						
						
						
					 
					
						2017-07-15 17:52:52 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						afae9398cb 
					 
					
						
						
							
							Comments. Removed sort-of duplicate access to GImGui->Font in ImDrawList::AddText() so it's only in one place.  
						
						
						
						
					 
					
						2017-07-14 17:49:42 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						12d265fa31 
					 
					
						
						
							
							Version 1.51 WIP tag  
						
						
						
						
					 
					
						2017-06-13 11:30:22 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a2f7c40e30 
					 
					
						
						
							
							Fixed comment ( #1178 )  
						
						
						
						
					 
					
						2017-06-13 11:29:21 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5e1caaaef3 
					 
					
						
						
							
							Version 1.50  
						
						
						
						
					 
					
						2017-06-02 12:22:34 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9da53bcecd 
					 
					
						
						
							
							ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)  
						
						
						
						
					 
					
						2017-05-26 13:42:36 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c5c77a3476 
					 
					
						
						
							
							ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon.  
						
						
						
						
					 
					
						2017-05-26 13:36:52 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0828a1fd6c 
					 
					
						
						
							
							Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account  
						
						
						
						
					 
					
						2017-05-14 16:27:10 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a0a6c8a2ef 
					 
					
						
						
							
							Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity.  (breaking API)  
						
						
						
						
					 
					
						2017-05-01 12:36:46 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6517d68cdf 
					 
					
						
						
							
							ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK ( #1009 )  
						
						
						
						
					 
					
						2017-05-01 12:34:32 +02:00 
						 
				 
			
				
					
						
							
							
								Peter 
							
						 
					 
					
						
						
							
						
						659b3fd259 
					 
					
						
						
							
							Add ImDrawList::AddImageQuad  
						
						... 
						
						
						
						Adds a function
  AddImageQuad(user_texture_id, a, b, c, d, uva, uvb, uvc, uvd, col)
that shows a texture on a full quad. This allows showing arbitrary
rotations of a texture. 
						
						
					 
					
						2017-04-28 10:04:20 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						670775ac22 
					 
					
						
						
							
							Added assert/comment about using MergeMode ( #1100 )  
						
						
						
						
					 
					
						2017-04-13 20:01:24 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e10ceebd36 
					 
					
						
						
							
							ImFont: Store the texture surface used to get an idea of how costly each font is.  
						
						
						
						
					 
					
						2017-03-17 21:29:57 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						b84eac53d8 
					 
					
						
						
							
							ImFont: Reorder field initialization to match declaration order  
						
						
						
						
					 
					
						2017-03-17 21:29:28 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						b8043d3ee5 
					 
					
						
						
							
							Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name ( #917 )  
						
						
						
						
					 
					
						2017-01-14 13:47:16 +01:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						68df09cf47 
					 
					
						
						
							
							Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse)  
						
						
						
						
					 
					
						2017-01-01 20:11:40 +01:00 
						 
				 
			
				
					
						
							
							
								Geoffrey Tucker 
							
						 
					 
					
						
						
							
						
						66c4281290 
					 
					
						
						
							
							Began improvements to columns API by splitting the Columns() function into BeginColumns() and EndColumns() and adding additional flags. The columns data still needs to be placed into a stack.  
						
						
						
						
					 
					
						2016-11-13 23:58:09 -08:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						8553bab241 
					 
					
						
						
							
							Ignoring overzealous GCC warnings ( #883 )  
						
						
						
						
					 
					
						2016-11-11 20:17:35 +01:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						620497e466 
					 
					
						
						
							
							Font: Font name include size  
						
						
						
						
					 
					
						2016-11-06 22:21:21 +01:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						b2f0ea6c0d 
					 
					
						
						
							
							Font: Default font given explicit name "ProggyClean.ttf"  
						
						
						
						
					 
					
						2016-11-06 21:51:20 +01:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						907dd2ed20 
					 
					
						
						
							
							Comments ( #896 )  
						
						
						
						
					 
					
						2016-11-06 15:25:28 +01:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						d567595dde 
					 
					
						
						
							
							ImDrawList: AddRect(), PathRect() default rounded_corner 0x0F->~0/-1 so it appears less obscure in IDE completions  
						
						
						
						
					 
					
						2016-10-09 10:35:01 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						e07d45709f 
					 
					
						
						
							
							ImDrawList: Uses IM_COL32_A_MASK macro instead of hardcoded zero alpha testing ( #844 )  
						
						
						
						
					 
					
						2016-10-07 09:49:52 +02:00 
						 
				 
			
				
					
						
							
							
								Jeongseok Lee 
							
						 
					 
					
						
						
							
						
						1d7e05327b 
					 
					
						
						
							
							Fix clang warning: unknown warning group '-Wreserved-id-macro'  
						
						
						
						
					 
					
						2016-10-06 14:48:47 -04:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						68c81739bf 
					 
					
						
						
							
							Minor tidying up following merge BGRA color PR ( #844 )  
						
						
						
						
					 
					
						2016-10-01 14:29:12 +02:00 
						 
				 
			
				
					
						
							
							
								Michał Cichoń 
							
						 
					 
					
						
						
							
						
						1999c01db8 
					 
					
						
						
							
							Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.  
						
						
						
						
					 
					
						2016-09-26 12:00:33 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						35c6fd682f 
					 
					
						
						
							
							Inhibiting a ??e sequence in the embedded font.  Shouldn't be treated as a trigraph but consistent with encoder ( #839 )  
						
						
						
						
					 
					
						2016-09-23 09:09:07 +02:00 
						 
				 
			
				
					
						
							
							
								ocornut 
							
						 
					 
					
						
						
							
						
						87d99fce6b 
					 
					
						
						
							
							ImFont: CalcWordWrapPositionA() fixed font scaling with fallback character. (followup to  86666489df)  
						
						
						
						
					 
					
						2016-09-19 09:32:21 +02:00