omar
							
						 | 
						
							
							
							
							
								
							
								55b99d753c
								
							
								
							
						 | 
						
							
							
								
								Minor string typo
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								059e838b2c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into navigation
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								be9628494a
								
							
								
							
						 | 
						
							
							
								
								Demo: Rearranged everything under Widgets in a more consistent way.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								453ad17a09
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into navigation
							
							
							
							
							
							
							
							# Conflicts:
#	imgui_demo.cpp 
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								d888de4483
								
							
								
							
						 | 
						
							
							
								
								Demo: Merged a few demo tweaks from navigation branch to minimize drift.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								30d1e5712a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into navigation
							
							
							
							
							
							
							
							# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h 
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								a78ef7a369
								
							
								
							
						 | 
						
							
							
								
								Comments
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								942cb0e1f2
								
							
								
							
						 | 
						
							
							
								
								Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								d952a8d3bf
								
							
								
							
						 | 
						
							
							
								
								Demo: Color widget demo tweaks (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								a4012fd5b2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into 2016-02-colorpicker
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								23fae61109
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into 2016-07-navigation
							
							
							
							
							
							
							
							# Conflicts:
#	imgui.cpp 
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								b5ad88627d
								
							
								
							
						 | 
						
							
							
								
								Merge various documentation tweaks, comments, todos from the Navigation Branch to reduce drift a little
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								a1bcc8392e
								
							
								
							
						 | 
						
							
							
								
								Fixed GetScrollMaxX() debug left-over from 7096fd8500 (#1271)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								03700ad15e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2016-07-navigation
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								1c991b525a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2016-02-colorpicker
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								0ab722c3c5
								
							
								
							
						 | 
						
							
							
								
								Columns: First first column appearing wider than others (#1266)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								d43c25d8f4
								
							
								
							
						 | 
						
							
							
								
								SetScrollHere() tweak to make the code a little less confusing
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								e36b41cbd0
								
							
								
							
						 | 
						
							
							
								
								Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								7096fd8500
								
							
								
							
						 | 
						
							
							
								
								Fixes for Vertical Scrollbar not automatically getting enabled if enabled Horizontal Scrollbar straddle the vertical limit. (#1271, #246)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								233a6efeba
								
							
								
							
						 | 
						
							
							
								
								Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions   in Begin(). (#1271)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								6d60e0fc58
								
							
								
							
						 | 
						
							
							
								
								Fonts readme tweaks, links
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								f4c0134f9f
								
							
								
							
						 | 
						
							
							
								
								Moved ColorEdit, ColorPicker declaration in their own section of imgui.h, minor comments adjustment (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								cdea8ca94f
								
							
								
							
						 | 
						
							
							
								
								Demo: Comment about 'static' and some tweaks (#1267)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								46c73cccff
								
							
								
							
						 | 
						
							
							
								
								Popups window can be moved (if they don't have explicit positions provided by user, or e.g. sub-menu popup) (#1252)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								d762f1dbfb
								
							
								
							
						 | 
						
							
							
								
								Comments, clarification about io.WantCaptureMouse, io.WantCaptureKeyboard flags timing and NewFrame(). (#1262)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								95f2706d1c
								
							
								
							
						 | 
						
							
							
								
								Clipboard: [windows] Fixed not closing win32 clipboard on early return. (#1264)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								40ac84d701
								
							
								
							
						 | 
						
							
							
								
								DataTypeApplyOpFromText: renamed local variables + comments to avoid confusion about the fact that int and float paths are not totally symetrical. (#671)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								f6460970c5
								
							
								
							
						 | 
						
							
							
								
								ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								fb54dce71c
								
							
								
							
						 | 
						
							
							
								
								Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								1a26d0bc98
								
							
								
							
						 | 
						
							
							
								
								Internals: Added ImDot(), ImRotate(), ImLerp(v2,v2,float) helpers.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								72da4081f8
								
							
								
							
						 | 
						
							
							
								
								Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								2f508c7073
								
							
								
							
						 | 
						
							
							
								
								ColorEdit: Extract ColorOptionsPopup() function out of ColorEdit4(). (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								10ef5a63f0
								
							
								
							
						 | 
						
							
							
								
								ColorPicker: Rearrange code to introduce alternate HSV picker/selector with simpler diff. (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								cc3cce7567
								
							
								
							
						 | 
						
							
							
								
								Comments, minor tidying up.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								e63ebd997f
								
							
								
							
						 | 
						
							
							
								
								Use ~IM_COL32_A_MASK instead of IM_COL32(255,255,255,0)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								70ee41b8b3
								
							
								
							
						 | 
						
							
							
								
								ColorPicker: Reordered drawing code to match left-to-right display. Extra comments. (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								4b2f157fb1
								
							
								
							
						 | 
						
							
							
								
								Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								efbb1ae04e
								
							
								
							
						 | 
						
							
							
								
								ColorPicker4: Fixed forwarding _HDR flag from ColorPicker4 back to ColorEdit4 components. (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								3ee969c3e3
								
							
								
							
						 | 
						
							
							
								
								ColorPicker: Alpha bar using a checkerboard. (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								3075d8bcd4
								
							
								
							
						 | 
						
							
							
								
								ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								f6a89779c8
								
							
								
							
						 | 
						
							
							
								
								ColorEdit4: Hex input clamps integer components to 0..255 range during printout (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								91a4f5df25
								
							
								
							
						 | 
						
							
							
								
								Demo: Tweaks
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								e1a00c3d26
								
							
								
							
						 | 
						
							
							
								
								ColorButton: Added frame border when style border are off. (#346) @jdumas
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								65a27732d8
								
							
								
							
						 | 
						
							
							
								
								ImGuiColorEditFlags: Made 0x01 unused for backward compatibility with old bool. Various comments tweaks. (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								90fcd4a829
								
							
								
							
						 | 
						
							
							
								
								Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								3fe7739b5d
								
							
								
							
						 | 
						
							
							
								
								ColorPicker: Honor ImGuiColorEditFlags_NoTooltip if for some reason user wants that. (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								4d844ffde1
								
							
								
							
						 | 
						
							
							
								
								Demo: custom ColorPicker popup example tweaks (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								f040547a5f
								
							
								
							
						 | 
						
							
							
								
								Demo: custom ColorPicker popup example (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								3ffcc72f98
								
							
								
							
						 | 
						
							
							
								
								ColorPicker: Better cursor/color preview over the color matrix. (#346)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								390188dfa9
								
							
								
							
						 | 
						
							
							
								
								Comments about parts of imgui_internal.h that will self-destruct.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) |