omar
							
						 | 
						
							
							
							
							
								
							
								f0364aa359
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'context'
							
							
							
							
							
							
							
							# Conflicts:
#	examples/allegro5_example/main.cpp
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx9_example/main.cpp
#	examples/marmalade_example/main.cpp
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp 
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								07ee539017
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'navigation'
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								4e5b7612ae
								
							
								
							
						 | 
						
							
							
								
								Nav: Documentation tweaks. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								ae30efc0fd
								
							
								
							
						 | 
						
							
							
								
								Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								3171f90a1a
								
							
								
							
						 | 
						
							
							
								
								Nav: Keyboard is now automatically mapped based on io.KeyDown[]. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								9e3a807813
								
							
								
							
						 | 
						
							
							
								
								Removed comments
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								057807f4a7
								
							
								
							
						 | 
						
							
							
								
								Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								7e32fc7109
								
							
								
							
						 | 
						
							
							
								
								Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								ed4bbc4fd4
								
							
								
							
						 | 
						
							
							
								
								Nav: Comments, guides.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								cea8017e0b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into context
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								3b7bd4563a
								
							
								
							
						 | 
						
							
							
								
								ImVec2: added [] operator. This is becoming desirable for some types of code, better added  sooner than later.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								ad09396672
								
							
								
							
						 | 
						
							
							
								
								ImVec2: added [] operator. This is becoming desirable for some types of code, better added  sooner than later.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								db071184a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into navigation
							
							
							
							
							
							
							
							# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								b50dce54ea
								
							
								
							
						 | 
						
							
							
								
								Drag and Drop: TreeNode as drop target displays rectangle over full frame. Added optional internal storage for item display rect. Will expose later. (#1597, #143)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								c6ba7c8231
								
							
								
							
						 | 
						
							
							
								
								Internals: TreeNode: Renaming local to be more consistent with other widgets.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								e6926d9f7c
								
							
								
							
						 | 
						
							
							
								
								Internals: Refactored bool LastItemRectHovered into flags. (#1597)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								ce2b8d3255
								
							
								
							
						 | 
						
							
							
								
								Nav: Comments, removed extraneous parameter.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								0c0d811859
								
							
								
							
						 | 
						
							
							
								
								Nav: SetItemDefaultFocus() doesn't make the navigation cursorr highlight visible. Renamed NavInitResultExplicit to NavInitRequestFromMove. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								4b49f03a40
								
							
								
							
						 | 
						
							
							
								
								Examples: SDL+GL3: Added Navigation keyboard mapping. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								7e1496e994
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into navigation
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								fcf1c9d151
								
							
								
							
						 | 
						
							
							
								
								Examples: SDL: Using SDL_GetPerformanceCounter() / SDL_GetPerformanceFrequency() to handle framerate over 1000 fps properly. Noticed bad inputs artefacts in Nav branch at 2000 fps without this. (#996)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								60fb7d31fd
								
							
								
							
						 | 
						
							
							
								
								Examples: SDL2: Enabling vsync. Using scancode consistently, fixed keyboard weirdness.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								73d493c780
								
							
								
							
						 | 
						
							
							
								
								Examples: Organized header files to make available features more visible.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								fb9fecea5e
								
							
								
							
						 | 
						
							
							
								
								Nav: Sliders and Drags are toggle activated instead of requiring user to cross Cross/Space. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								4932303e62
								
							
								
							
						 | 
						
							
							
								
								Nav: DragBehavior: Tweaks (to take the noise out of the next commit).
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								e5e3cc617e
								
							
								
							
						 | 
						
							
							
								
								Nav: Maintaining a NavActivatePressedId field that widget can conveniently use along with NavActivateDownId.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								fb7cf4a475
								
							
								
							
						 | 
						
							
							
								
								Nav: Removed old unnecessary ifdefs.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								f35734c925
								
							
								
							
						 | 
						
							
							
								
								Nav: Debugging code. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								92ee6b1185
								
							
								
							
						 | 
						
							
							
								
								Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								348c46d21e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into navigation
							
							
							
							
							
							
							
							# Conflicts:
#	imgui.cpp 
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								5c83b55d04
								
							
								
							
						 | 
						
							
							
								
								Nav: Added ImGuiWindowFlags_NoNav shortcut, comments. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								11d0fc8220
								
							
								
							
						 | 
						
							
							
								
								Tooltip: BeginTooltip() sets NoInputs flag.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								1dedbf8091
								
							
								
							
						 | 
						
							
							
								
								Style: Fixed missing style.MouseCursorScale initialization (#939), messed up original commit badly.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								533fe8cb55
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into navigation
							
							
							
							
							
							
							
							# Conflicts:
#	imgui.cpp 
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								8ad88f725c
								
							
								
							
						 | 
						
							
							
								
								Nav: Minor tidying up. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								3f297e74e4
								
							
								
							
						 | 
						
							
							
								
								Merging the minor/shallow changes from Navigation branch.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								bed55a41e1
								
							
								
							
						 | 
						
							
							
								
								Internals: ImRect: Added IsInverted() helper.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								2081fc15b5
								
							
								
							
						 | 
						
							
							
								
								Added assert in BeginChild(ImGuiId id).
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								223be68d77
								
							
								
							
						 | 
						
							
							
								
								Nav: Debugging stuff.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								cf6b39600b
								
							
								
							
						 | 
						
							
							
								
								imgui_freetype: comments about correct blending and sRGB (#618, #578)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								a33b86dac7
								
							
								
							
						 | 
						
							
							
								
								Removed root .gitignore. (#1594)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b76cf9cc87
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1594 from gerryhernandez/fix-apple-example
							
							
							
							
							
							
							
							Examples: Apple: Fix iOS code; fixes entire XCode build for Apple example 
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								Gerry Hernandez
							
						 | 
						
							
							
							
							
								
							
								4786321754
								
							
								
							
						 | 
						
							
							
								
								Fix iOS code; fixes entire XCode build for Apple example
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								66ff820eaa
								
							
								
							
						 | 
						
							
							
								
								Nav: Ensure g.NavScoringRectScreen is always finite and not inverted. (#787)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								e2654a097b
								
							
								
							
						 | 
						
							
							
								
								ImRect: added IsInverted() helper.
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								0bd15b52a6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into navigation
							
							
							
							
							
							
							
							# Conflicts:
#	imgui.cpp 
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								7b005bd7de
								
							
								
							
						 | 
						
							
							
								
								imgui_freetype: Documentation, tweaks. (#618)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								e9a617b22a
								
							
								
							
						 | 
						
							
							
								
								Moved imgui_freetype from imgui_club (#618)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								147ec8d1e2
								
							
								
							
						 | 
						
							
							
								
								Style Added style.MouseCursorScale, may remove (#939).
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) | 
						
					
				
					
						
							
							
								 
								omar
							
						 | 
						
							
							
							
							
								
							
								648de2fc00
								
							
								
							
						 | 
						
							
							
								
								Nav: Press Left on a child with ImGuiTreeNodeFlags_NavCloseFromChild moves you to parent node instead of closing it immediately. More standard. (#787, #1079)
							
							
							
							
							
						 | 
						
							ago%!(EXTRA string=8 years) |