ocornut
							
						 | 
						
							
							
							
							
								
							
								c1b55991c0
								
							
								
							
						 | 
						
							
							
								
								Window: fixed child window sizing lag + minimum size clamping lag
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								70f83a3a65
								
							
								
							
						 | 
						
							
							
								
								Popups: child popups (menus) hidden on their first frame the same way as regular popup
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								e9b6e437eb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
							
							
							
							
							
							
							
							Conflicts:
	imgui.cpp
	imgui.h 
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								1eafe86627
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
							
							
							
							
							
							
							
							Conflicts:
	imgui.cpp 
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								81937d34a8
								
							
								
							
						 | 
						
							
							
								
								Popups: made OpenPopup()/close loops reclaim focus and update popup position. It is generally a mistake but it's now more easy to understand
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								fa0f0f4507
								
							
								
							
						 | 
						
							
							
								
								ImVector: tweak growth strategy
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								1fe2906923
								
							
								
							
						 | 
						
							
							
								
								Metrics: do not count free(NULL) calls. Settings: contiguous allocations for ImGuiIniData.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								900394a612
								
							
								
							
						 | 
						
							
							
								
								Metrics: metrics window shows popups list
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								222a9231bb
								
							
								
							
						 | 
						
							
							
								
								Examples: Console: example uses standard malloc/free, makes more sense as a copy & pastable example
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								d9ca8f3145
								
							
								
							
						 | 
						
							
							
								
								Added IO.MetricsAllocs counter (number of memory allocations
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								d9b2a90773
								
							
								
							
						 | 
						
							
							
								
								Popups: fixed child windows within popups vs handling of sub menus. Added examples.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								748072c045
								
							
								
							
						 | 
						
							
							
								
								Popups: identifying popups by their id to avoid conflict when recycling popup durnig same same (CloseCurrentPopup followed by Open+Begin)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								e57ee2852a
								
							
								
							
						 | 
						
							
							
								
								Comments
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								1e4c22c206
								
							
								
							
						 | 
						
							
							
								
								Added io.MetricsActiveWindows counter (#213)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								5df542c3c0
								
							
								
							
						 | 
						
							
							
								
								ImFontAtlas: doesn't clear input data, left to the application. (#224)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								4b088ec7e8
								
							
								
							
						 | 
						
							
							
								
								ImFontAtlas: Fix toward allowing to add extra font without clearing existing one (need to comment out ClearInputData) (#224)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								9d9cf31972
								
							
								
							
						 | 
						
							
							
								
								ImFontAtlas: added ClearFonts(), making the different clear funcs more explicit (#224)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								ad79db32c7
								
							
								
							
						 | 
						
							
							
								
								Window title text centering tweaks, RenderTextClipped() now has different args for pos_max and clip_max #222
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								30552ecfd6
								
							
								
							
						 | 
						
							
							
								
								Fixed comment (fix #223)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								356a37edcf
								
							
								
							
						 | 
						
							
							
								
								Added window title text horizontal alignment option (#222),, ImGuiAlign_ type for future use.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								03720acaff
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2015-05-menus
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								9be3319653
								
							
								
							
						 | 
						
							
							
								
								Tweaks, comments around ImFontAtlas
							
							
							
							
							
							
							
							Removed unsigned int from API 
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								9e307d60e3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2015-05-menus
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								515e0c6122
								
							
								
							
						 | 
						
							
							
								
								Cleanup, merged duplicate code into a function
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								317744489f
								
							
								
							
						 | 
						
							
							
								
								WIP Menus: sub-menu arrow alignment take account of extension by other widgets (#126)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								5082182790
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2015-05-menus
							
							
							
							
							
							
							
							Conflicts:
	imgui.h 
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								ba7a4fc034
								
							
								
							
						 | 
						
							
							
								
								WIP Menus: minor cleanup using a ImGuiSimpleColumns helper type (#126)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								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) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								79198fd6a5
								
							
								
							
						 | 
						
							
							
								
								Default item width for AlwaysAutoResize windows expressed as a factor of font height
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								34aad73fd8
								
							
								
							
						 | 
						
							
							
								
								Added ImGuiCol_TextDisabled
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								141ac8beab
								
							
								
							
						 | 
						
							
							
								
								Tweaks
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								33a2fd368a
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #218 from paperManu/inputNFlags
							
							
							
							
							
							
							
							InputFloat2/3/4, InputInt2/3/4: Added extra_flags parameter. 
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								Emmanuel Durand
							
						 | 
						
							
							
							
							
								
							
								b3faed610d
								
							
								
							
						 | 
						
							
							
								
								Renamed flags to extra_flags in last commit
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								fcd08ed8d4
								
							
								
							
						 | 
						
							
							
								
								BeginPopup() API had to be changed! :( Proper support for stacked popups, leading into menus (wip #126)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								Emmanuel Durand
							
						 | 
						
							
							
							
							
								
							
								94b7c9e307
								
							
								
							
						 | 
						
							
							
								
								Input text flags added to InputFloatN and InputIntN
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								cd2ec7868c
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #217 from Pagghiu/bugfix
							
							
							
							
							
							
							
							Example fix PopStyleVar on Vertical Slider to avoid assertion 
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								Stefano Cristiano
							
						 | 
						
							
							
							
							
								
							
								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) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								4a41ce9414
								
							
								
							
						 | 
						
							
							
								
								InputText: make sure Ctrl+V has ONLY the control key pressed (follow up to #214) + tidying
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								c2c43928a9
								
							
								
							
						 | 
						
							
							
								
								Untabifiy
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								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) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								4913668ea4
								
							
								
							
						 | 
						
							
							
								
								Fixed implicit conversion of NULL constant to bool (fix #216)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ghassanpl
							
						 | 
						
							
							
							
							
								
							
								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) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								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) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								f293bec97c
								
							
								
							
						 | 
						
							
							
								
								Added style.ScrollbarRounding #212
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								d23709ce35
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into 2015-05-menus
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								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) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								debe6522bb
								
							
								
							
						 | 
						
							
							
								
								Examples: test for tooltip over popup.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								33e8fb85cf
								
							
								
							
						 | 
						
							
							
								
								Allow stacking popups, not really useful yet (wip #126)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								dd2a578012
								
							
								
							
						 | 
						
							
							
								
								Added ImGuiSetCond_Appearing to test the hidden->visible transition.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) | 
						
					
				
					
						
							
							
								 
								ocornut
							
						 | 
						
							
							
							
							
								
							
								f46557d2d6
								
							
								
							
						 | 
						
							
							
								
								MenuItem() draft for popups, with Selected option (wip #126)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=11 years) |