omar
							
						 
					 | 
					
						
						
							
						
						dfb82d5c22
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	examples/example_sdl_opengl2/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	imgui.cpp 
						
						
					 | 
					
						2019-04-25 17:53:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						56c3aaf6bd
					 | 
					
						
						
							
							Nav: Fixed Drag/Slider functions going into text input mode when keyboard CTRL is held while pressing NavActivate.
						
						
						
						
						
						
					 | 
					
						2019-04-25 17:50:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						0ca1675ff9
					 | 
					
						
						
							
							Internals: TempInputText: Rename InputScalarAsWidgetReplacement() -> TempInputTextScalar(), ScalarAsInputTextId -> TempInputTextId, small tidying up in affected functions.
						
						
						
						
						
						
					 | 
					
						2019-04-25 16:03:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4dc4ace864
					 | 
					
						
						
							
							Window: Fixed window with the AlwaysAutoResize flag unnecessarily extending their hovering boundaries by a few pixels (this is used to facilitate resizing from borders when available for a given window). One of the noticeable minor side effect was that navigating menus would have had a tendency to disable highlight from parent menu items earlier than necessary while approaching the child menu.
						
						
						
						
						
						
						
						+ Changelog fixed unfinished sentence and tweaks, 
						
						
					 | 
					
						2019-04-25 11:50:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6db0766564
					 | 
					
						
						
							
							Misc comments, internal renaming, added disable indentation option to Columns demo section.
						
						
						
						
						
						
					 | 
					
						2019-04-24 17:40:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6789ea3482
					 | 
					
						
						
							
							Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. (#2509, #2484).
						
						
						
						
						
						
					 | 
					
						2019-04-23 12:38:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						03b64defa5
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui.h 
						
						
					 | 
					
						2019-04-19 19:52:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5078fa208b
					 | 
					
						
						
							
							Added SetNextItemWidth() helper to avoid using PushItemWidth/PopItemWidth() for single items.
						
						
						
						
						
						
					 | 
					
						2019-04-18 18:29:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						0e46d65b03
					 | 
					
						
						
							
							Misc: Fixed PushItemWidth(-width) (for right-side alignment) laying out certain items (button, listbox, etc.) with negative sizes if the 'width' argument was smaller than the available width at the time of item submission,
						
						
						
						
						
						
					 | 
					
						2019-04-18 15:46:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						240dddff87
					 | 
					
						
						
							
							Combo, Slider: Improve rendering in situation when there's there's very little space available.
						
						
						
						
						
						
					 | 
					
						2019-04-18 15:46:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1d3ebef364
					 | 
					
						
						
							
							Columns: Fixed boundary of clipping being off by 1 pixel within the left column.
						
						
						
						
						
						
					 | 
					
						2019-04-17 21:51:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1f25cdd6b4
					 | 
					
						
						
							
							Clarified asserts comments + todo entries. (#2500)
						
						
						
						
						
						
					 | 
					
						2019-04-17 09:59:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						7baf45cffa
					 | 
					
						
						
							
							Metrics: Added "Show windows rectangles" tool to visualize the different rectangles.
						
						
						
						
						
						
					 | 
					
						2019-04-16 22:02:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						655ebe4eaf
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp 
						
						
					 | 
					
						2019-04-16 13:14:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						742b5f4c68
					 | 
					
						
						
							
							Merged a bunch of small changes from Docking branch to reduce the difference between branches.
						
						
						
						
						
						
						
						Noticeable: horizontal alignment of CloseButton. Menu fill take account of border. Various stylistic tweaks to accomodate other changes in Docking. 
						
						
					 | 
					
						2019-04-16 13:07:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						8130fd9816
					 | 
					
						
						
							
							Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). (#2496)
						
						
						
						
						
						
					 | 
					
						2019-04-15 18:47:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						b89202824e
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_sdl.cpp 
						
						
					 | 
					
						2019-04-15 16:03:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						35cbf9c052
					 | 
					
						
						
							
							Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.
						
						
						
						
						
						
					 | 
					
						2019-04-15 15:48:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						c1848b185c
					 | 
					
						
						
							
							Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. (#2494)
						
						
						
						
						
						
					 | 
					
						2019-04-15 01:28:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						712203dbcb
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 | 
					
						2019-04-13 18:53:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						30d81f53cb
					 | 
					
						
						
							
							PlotLines, PlotHistogram: Ignore NaN values when calculating min/max bounds. (#2485)
						
						
						
						
						
						
					 | 
					
						2019-04-12 22:16:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						cf029b3e1c
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
					 | 
					
						2019-04-08 18:05:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						b53630813e
					 | 
					
						
						
							
							Internals: Tweak ItemSize calls. Added todo items.
						
						
						
						
						
						
					 | 
					
						2019-04-08 16:13:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						50ceb25003
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_vulkan.cpp 
						
						
					 | 
					
						2019-04-07 16:23:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ccca76fdea
					 | 
					
						
						
							
							Merge branch 'vulkan_fix_master'
						
						
						
						
						
						
					 | 
					
						2019-04-07 16:22:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						302af7b2c9
					 | 
					
						
						
							
							FAQ tweaks. Add missing entries in imgui.cpp (which until now where only in the README).
						
						
						
						
						
						
					 | 
					
						2019-04-07 16:22:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						c8fd4afd75
					 | 
					
						
						
							
							Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert  to using the ImGui::MemAlloc()/MemFree() calls directly.
						
						
						
						
						
						
					 | 
					
						2019-04-05 20:20:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						bd351e9ac5
					 | 
					
						
						
							
							Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert  to using the ImGui::MemAlloc()/MemFree() calls directly.
						
						
						
						
						
						
					 | 
					
						2019-04-05 20:20:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						452047c7ca
					 | 
					
						
						
							
							Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
						
						
						
						
						
						
					 | 
					
						2019-04-05 18:24:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ec76722d2d
					 | 
					
						
						
							
							Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. (#2472, #2071)
						
						
						
						
						
						
					 | 
					
						2019-04-05 17:22:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						0034e65c26
					 | 
					
						
						
							
							Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
						
						
						
						
						
						
					 | 
					
						2019-04-04 23:40:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4f54a527ab
					 | 
					
						
						
							
							Vulkan: Renaming, we want InitInfo to source MinImageCount which is the "source" value (so viewport creation can use this). Made ImGui_ImplVulkan_DestroyFrameRenderBuffers public. (#2071)
						
						
						
						
						
						
					 | 
					
						2019-04-04 23:13:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						66f4be2e13
					 | 
					
						
						
							
							Vulkan: Added extra parameter to ImGui_ImplVulkan_RenderDrawData(). User is in charge of owning/storing 1 ImGui_ImplVulkan_FrameRenderBuffers per in-flight rendering frame. Removed ImGui_ImplVulkan_SetFramesQueueSize. (#2461, #2348, #2378, #2097, #2071, #1677)
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:27:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						54b8a65d9e
					 | 
					
						
						
							
							Examples: Vulkan: Renamed QueuedFramesCount to FramesQueueSize. Moved Framebuffer, Backbuffer to FrameData structure. (#2071)
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:12:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						317859a3da
					 | 
					
						
						
							
							Examples: Vulkan: Updated Changelog, removed debug code, tweaked code, made GLFW/SDL match each others. Initialize FrameDataForRender fields. Added Assertion. Clearing fields on DestroyFrameData(). (#2071)
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:11:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						43a85dd02e
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:10:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1c3311e4d6
					 | 
					
						
						
							
							Vulkan: Avoid passing negative coordinates to vkCmdSetScissor, which debug validation layers do not like.
						
						
						
						
						
						
					 | 
					
						2019-04-04 22:09:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						cdb109f617
					 | 
					
						
						
							
							Renamed freeglut vcxproj files + Comments, Changelog (#2465)
						
						
						
						
						
						
					 | 
					
						2019-04-03 16:25:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Willmott
							
						 
					 | 
					
						
						
							
						
						ece322ff12
					 | 
					
						
						
							
							freeglut -> glut rename
						
						
						
						
						
						
					 | 
					
						2019-04-03 07:19:31 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						49fb8e6c45
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl3.cpp 
						
						
					 | 
					
						2019-04-03 11:17:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						8dab7ac021
					 | 
					
						
						
							
							InputText: Made Shift+Tab consistently do nothing regardless of whether the back-end emits both char and keys or just keys. (#2467, #1336)
						
						
						
						
						
						
					 | 
					
						2019-04-03 11:14:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						da035ced97
					 | 
					
						
						
							
							InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. (#1336, #2467)
						
						
						
						
						
						
						
						+ Fix some output filename in SDL build batch files. 
						
						
					 | 
					
						2019-04-03 11:04:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						01e29a3933
					 | 
					
						
						
							
							InputText: Fixed ImGuiInputTextFlags_AllowTabInput leading to two tabs characters being inserted if the back-end provided both Key and Character input. (#2467, #1336)
						
						
						
						
						
						
					 | 
					
						2019-04-03 10:45:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4a57507f75
					 | 
					
						
						
							
							InputText: Work-around for buggy standard libraries where isprint('\t') returns true. (#2467, #1336)
						
						
						
						
						
						
						
						Not using isprint. + todo items. 
						
						
					 | 
					
						2019-04-03 10:40:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3a737e665a
					 | 
					
						
						
							
							Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo
						
						
						
						
						
						
					 | 
					
						2019-04-02 10:36:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e21bbee311
					 | 
					
						
						
							
							Examples: DirectX9: Fixed erroneous assert in ImGui_ImplDX9_InvalidateDeviceObjects(). FreeType: Fixed suggested code to not require an initial build call.. (#2454)
						
						
						
						
						
						
					 | 
					
						2019-03-29 18:32:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						512d39d031
					 | 
					
						
						
							
							Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.
						
						
						
						
						
						
					 | 
					
						2019-03-29 16:17:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9bf6509c6e
					 | 
					
						
						
							
							Docking: Fixed focus restore lagging by a frame when a tab stops being submitted. (#2109) Building on a little build of technical debt there, should transition toward a more general docking-agnostic system (#2304)
						
						
						
						
						
						
					 | 
					
						2019-03-28 18:43:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						b6ae8a0dca
					 | 
					
						
						
							
							Docking: Disable SkipItems when directly/programmatically focused (possible generalization of code currently in BeginDocked which relies on tab bar interaction, will remove that code in next commit). (#2453, #2109)
						
						
						
						
						
						
					 | 
					
						2019-03-28 16:11:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						a33d45d7cd
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp 
						
						
					 | 
					
						2019-03-28 15:48:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |