5082182790 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2015-05-menus  
							
							... 
							
							
 
							
							Conflicts:
	imgui.h 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								ba7a4fc034 
								
							
								 
							
						 
						
							
							
								
								WIP Menus: minor cleanup using a ImGuiSimpleColumns helper type ( #126 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								7fb704d308 
								
							
								 
							
						 
						
							
							
								
								WIP intermediary branch commit for  menus, submenus (some large inconsistencies remaining in API + need cleanup)  ( #126 )  
							
							... 
							
							
 
							
							May remove the ImGuiWindowFlags_Menu alltogether 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								79198fd6a5 
								
							
								 
							
						 
						
							
							
								
								Default item width for AlwaysAutoResize windows expressed as a factor of font height  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								34aad73fd8 
								
							
								 
							
						 
						
							
							
								
								Added ImGuiCol_TextDisabled  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								141ac8beab 
								
							
								 
							
						 
						
							
							
								
								Tweaks  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								33a2fd368a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #218  from paperManu/inputNFlags  
							
							... 
							
							
 
							
							InputFloat2/3/4, InputInt2/3/4: Added extra_flags parameter. 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								b3faed610d 
								
							
								 
							
						 
						
							
							
								
								Renamed flags to extra_flags in last commit  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								fcd08ed8d4 
								
							
								 
							
						 
						
							
							
								
								BeginPopup() API had to be changed! :( Proper support for stacked popups, leading into menus (wip  #126 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								94b7c9e307 
								
							
								 
							
						 
						
							
							
								
								Input text flags added to InputFloatN and InputIntN  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								cd2ec7868c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #217  from Pagghiu/bugfix  
							
							... 
							
							
 
							
							Example fix PopStyleVar on Vertical Slider to avoid assertion 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								99a1a85f1f 
								
							
								 
							
						 
						
							
							
								
								Example fix PopStyleVar on Vertical Slider to avoid assertion  
							
							... 
							
							
 
							
							Adding an explicit ImGui::PopStyleVar to avoid assertion in
CheckStacksSize 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								4a41ce9414 
								
							
								 
							
						 
						
							
							
								
								InputText: make sure Ctrl+V has ONLY the control key pressed (follow up to  #214 ) + tidying  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								c2c43928a9 
								
							
								 
							
						 
						
							
							
								
								Untabifiy  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								8ac9036db3 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #214  from ghassanpl/upstream  
							
							... 
							
							
 
							
							InputText(): make sure letter-key shortcuts have ONLY the control key pressed 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								4913668ea4 
								
							
								 
							
						 
						
							
							
								
								Fixed implicit conversion of NULL constant to bool ( fix   #216 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								bb2d3a8b41 
								
							
								 
							
						 
						
							
							
								
								* make sure letter-key shortcuts have ONLY the control key pressed (fixes bug for AltGr->Ctrl+Alt on windows)  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								6c1084eaa1 
								
							
								 
							
						 
						
							
							
								
								Shutdown() test for g.IO.Fonts not being NULL to allow workarounds in case of using multiple contexts  #207  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								f293bec97c 
								
							
								 
							
						 
						
							
							
								
								Added style.ScrollbarRounding  #212  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								d23709ce35 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2015-05-menus  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								9fe654c6e4 
								
							
								 
							
						 
						
							
							
								
								Assert on modifiers stack size mismatch between Begni()/End() pairs  #204  
							
							... 
							
							
 
							
							Experimenting with this. It's helpful but not happy with the idea of
ImGui asserting on that sort of user error. 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								debe6522bb 
								
							
								 
							
						 
						
							
							
								
								Examples: test for tooltip over popup.  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								33e8fb85cf 
								
							
								 
							
						 
						
							
							
								
								Allow stacking popups, not really useful yet (wip  #126 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								dd2a578012 
								
							
								 
							
						 
						
							
							
								
								Added ImGuiSetCond_Appearing to test the hidden->visible transition.  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								f46557d2d6 
								
							
								 
							
						 
						
							
							
								
								MenuItem() draft for popups, with Selected option (wip  #126 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								c36172ebef 
								
							
								 
							
						 
						
							
							
								
								Tweak RenderCheckMark()  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								85b8967291 
								
							
								 
							
						 
						
							
							
								
								Added RenderCheckMark() helper following the font size  
							
							... 
							
							
 
							
							Pretty ugly, not sure what's the right way to solve that automatically,
better shown as an "icon" so it doesn't have to necessarily look like
the font. 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								13c3f11c66 
								
							
								 
							
						 
						
							
							
								
								Comments ( #209 )  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								fbbe7fee53 
								
							
								 
							
						 
						
							
							
								
								Fix "Debug" window stealing focus/popup  #208   #209   @thevaber  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								25d8c1af91 
								
							
								 
							
						 
						
							
							
								
								Removed inline marker  #210  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								e7ffcea33d 
								
							
								 
							
						 
						
							
							
								
								Removed style.AutoFitPadding, using style.WindowPadding makes more sense (the default values were already the same).  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								b1b23d6ca9 
								
							
								 
							
						 
						
							
							
								
								Autofit cancel out one worth of vertical spacing for correct symmetry (group and tooltip already do that)  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								0ca7926b94 
								
							
								 
							
						 
						
							
							
								
								Popup auto-border doesn't spread to its childs  #197  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								a3a10d4a3c 
								
							
								 
							
						 
						
							
							
								
								Popup have borders by default  #197  attenuated border alpha in default theme  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								47e875314b 
								
							
								 
							
						 
						
							
							
								
								Plot: overlay label clipped within frame when bigger than frame  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								f00662a5ad 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								08fd6a7e7d 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives  
							
							... 
							
							
 
							
							Conflicts:
	imgui.cpp 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								d84b5737a6 
								
							
								 
							
						 
						
							
							
								
								Popups, Tooltips: fit within display. Hidden during size calculation. Fixed popups flicker when changing size.  
							
							... 
							
							
 
							
							Big change, needed reorder of Begin(). May trigger new bugs. 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								99e315d2b2 
								
							
								 
							
						 
						
							
							
								
								Fix for width of child windows with scrollbar (broken  376a6a5af0)  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								221f36e116 
								
							
								 
							
						 
						
							
							
								
								Comments, tweaks, metrics window tweak  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								a3560b274e 
								
							
								 
							
						 
						
							
							
								
								Tidying up Begin(): using local copy of 'flags' for brevity  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								6ca4b31bf8 
								
							
								 
							
						 
						
							
							
								
								Fixed popup resizing (broken  376a6a5af0)  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								a906738ba7 
								
							
								 
							
						 
						
							
							
								
								Renamed Visible->Active internally  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								1b5795c96d 
								
							
								 
							
						 
						
							
							
								
								InputText: fixed incorrect edit state after text buffer is modified by user through callback  #206  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								81bf614821 
								
							
								 
							
						 
						
							
							
								
								Fix window size after collapsing (broken  376a6a5af0)  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								7fac4013a4 
								
							
								 
							
						 
						
							
							
								
								Build fix  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								4e292bf67d 
								
							
								 
							
						 
						
							
							
								
								Tidying up Begin(): separated blocks needed for auto-resize so it can be moved above position calculation later  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								376a6a5af0 
								
							
								 
							
						 
						
							
							
								
								Tidying up Begin() separated blocks needed for auto-resize so it can be moved above position calculation later  
							
							... 
							
							
 
							
							Being cautious again. Hopefully didn't break anything. 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								46f55fe6f6 
								
							
								 
							
						 
						
							
							
								
								Tidying up Begin()  
							
							
 
							
						 
						
							ago%!(EXTRA string=11 years)  
				
					
						
							
							
								 
						
							
							
								3f7f256752 
								
							
								 
							
						 
						
							
							
								
								Tidying up. Re-arranged the (first_begin_of_the_frame) blocks in Begin() for further changes.  
							
							... 
							
							
 
							
							Being cautious. 
							
						 
						
							ago%!(EXTRA string=11 years)