omar
							
						 
					 | 
					
						
						
							
						
						70fa37527d
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_draw.cpp
#	imgui_internal.h 
						
						
					 | 
					
						2020-07-29 15:15:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						b8c22bdb28
					 | 
					
						
						
							
							DragFloatRange2, DragIntRange2: Fixed an issue allowing to drag out of bounds when both min and max value are on the same value. (#1441)
						
						
						
						
						
						
					 | 
					
						2020-07-23 19:05:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e223bd8177
					 | 
					
						
						
							
							ImDrawList: changed AddCircle(), AddCircleFilled() default num_segments from 12 to 0.
						
						
						
						
						
						
					 | 
					
						2020-07-16 22:25:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4be8155002
					 | 
					
						
						
							
							Style Editor: Added preview of circle auto-tessellation when editing the corresponding value..
						
						
						
						
						
						
					 | 
					
						2020-07-16 21:51:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						825f2ae455
					 | 
					
						
						
							
							Demo: Tweak "child windows" section. (#3318)
						
						
						
						
						
						
					 | 
					
						2020-07-16 17:20:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f79f0e42f7
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.h 
						
						
					 | 
					
						2020-07-14 18:38:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						eefae08261
					 | 
					
						
						
							
							Nav: Fixed clicking on void from not clearing focused window. Amend d31fe97f7.  (#3344, #2880)
						
						
						
						
						
						
						
						This would be problematic e.g. in situation where the application relies on io.WantCaptureKeyboard flag being cleared accordingly. 
						
						
					 | 
					
						2020-07-14 18:36:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						550f110354
					 | 
					
						
						
							
							InputText, ImDrawList: Fixed assert triggering when drawing single line of text with more than ~16 KB characters. (#3349)
						
						
						
						
						
						
					 | 
					
						2020-07-12 23:51:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						fb7f6cab8c
					 | 
					
						
						
							
							Backends: Amend, docs + extra comments. (#3330, #3245)
						
						
						
						
						
						
					 | 
					
						2020-07-10 14:36:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						89685b346c
					 | 
					
						
						
							
							ImDrawList: Fixed minor bug introduced in 1.75 where AddCircle() with 12 segments would generate an extra unrequired vertex.
						
						
						
						
						
						
						
						Actual missing code for d3b37180a3, thanks @domgho! 
						
						
					 | 
					
						2020-07-09 11:21:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3a6c9907cd
					 | 
					
						
						
							
							Texture-based thick lines: Minor tweaks and rename toward merging in master. Changes to allow changing AA_SIZE (disable texture path).
						
						
						
						
						
						
					 | 
					
						2020-07-08 20:18:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ab4ef822f0
					 | 
					
						
						
							
							Version 1.78 WIP
						
						
						
						
						
						
					 | 
					
						2020-06-30 16:56:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ddabfc3477
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp 
						
						
					 | 
					
						2020-06-29 17:15:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9418dcb693
					 | 
					
						
						
							
							Version 1.77
						
						
						
						
						
						
						
						+ fix minor clang-tidy warnings which seems reasonable 
						
						
					 | 
					
						2020-06-29 15:54:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rokas Kupstys
							
						 
					 | 
					
						
						
							
						
						d7ef56dca2
					 | 
					
						
						
							
							Windows: Fix unintended window size changes when resizing windows close to main viewport edges.
						
						
						
						
						
						
					 | 
					
						2020-06-25 22:58:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rokas Kupstys
							
						 
					 | 
					
						
						
							
						
						6b0cf2e6ae
					 | 
					
						
						
							
							Windows: Fix unintended window size changes when resizing windows close to main viewport edges.
						
						
						
						
						
						
					 | 
					
						2020-06-25 22:16:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						45a7cf47ab
					 | 
					
						
						
							
							FAQ update, removed redundant block in imgui.cpp
						
						
						
						
						
						
					 | 
					
						2020-06-25 16:44:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5628416bd3
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp 
						
						
					 | 
					
						2020-06-25 14:03:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						fed80b9537
					 | 
					
						
						
							
							Popups: Changed 'int mouse_buttons' to ImGuiPopupFlags. Added ImGuiPopupFlags_NoOpenOverExistingPopup, ImGuiPopupFlags_NoOpenOverItems. Refactored signature of BeginPopupContextWindow().
						
						
						
						
						
						
					 | 
					
						2020-06-23 20:05:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5acf6d861a
					 | 
					
						
						
							
							Popups: Added ImGuiPopupFlags type, ImGuiPopupFlags_AnyPopupId and ImGuiPopupFlags_AnyPopupLevel flags for IsPopupOpen().
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt 
						
						
					 | 
					
						2020-06-23 20:00:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						a616ff5d4a
					 | 
					
						
						
							
							BeginPopupModal() doesn't set the ImGuiWindowFlags_NoSavedSettings flag anymore, and will not always be auto-centered. (#915, #3091)
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 | 
					
						2020-06-23 17:54:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						b83a1f3b00
					 | 
					
						
						
							
							BeginPopupModal() doesn't set the ImGuiWindowFlags_NoSavedSettings flag anymore, and will not always be auto-centered. (#915, #3091)
						
						
						
						
						
						
					 | 
					
						2020-06-23 17:52:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						20d61f5f62
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 | 
					
						2020-06-20 22:06:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						99f68d7958
					 | 
					
						
						
							
							Docs: Added FAQ entries removed old one which is misleading today. Misc tweaks.
						
						
						
						
						
						
					 | 
					
						2020-06-19 11:34:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Schnellbach
							
						 
					 | 
					
						
						
							
						
						b1d8309abc
					 | 
					
						
						
							
							Added ImGuiTabItemFlags_NoTooltip for individual Tab Item.
						
						
						
						
						
						
					 | 
					
						2020-06-18 15:55:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						078571b7a9
					 | 
					
						
						
							
							Popups: added comments, reorganized the functions in imgui.h
						
						
						
						
						
						
					 | 
					
						2020-06-16 23:39:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						6e138504c1
					 | 
					
						
						
							
							Popups: Fix BeginPopupContextVoid() when clicking over the area made unavailable by a modal. (#1636)
						
						
						
						
						
						
					 | 
					
						2020-06-16 19:32:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						d31fe97f74
					 | 
					
						
						
							
							Popups: Fix an edge case where programatically closing a popup while clicking on its empty space would attempt to focus it and close other popups. (#2880)
						
						
						
						
						
						
					 | 
					
						2020-06-16 17:10:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						99ab521024
					 | 
					
						
						
							
							Renamed OpenPopupOnItemClick() to OpenPopupContextItem(). Kept inline redirection function (will obsolete). + Removed CalcItemRectClosestPoint() entry point
						
						
						
						
						
						
					 | 
					
						2020-06-15 22:12:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						90c0c0c163
					 | 
					
						
						
							
							Columns: Lower overhead on column switches and switching to background channel. (second attempt for 9b3ce49)
						
						
						
						
						
						
						
						Internals: Bits, comments, added ImRect::ToVec4() 
						
						
					 | 
					
						2020-06-13 18:04:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ben Carter
							
						 
					 | 
					
						
						
							
						
						d3b37180a3
					 | 
					
						
						
							
							ImDrawList: Fixed minor bug introduced in 1.75 where AddCircle() with 12 segments would generate an extra unrequired vertex.
						
						
						
						
						
						
						
						Amend 5363af7f47, 051ce0765e 
						
						
					 | 
					
						2020-06-13 14:16:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						2665288b30
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 | 
					
						2020-06-11 11:36:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						a933cc4f4d
					 | 
					
						
						
							
							Documentation update
						
						
						
						
						
						
					 | 
					
						2020-06-11 10:21:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						16da8e6da6
					 | 
					
						
						
							
							Revert "Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). (#125)"
						
						
						
						
						
						
						
						This reverts commit 9b3ce494fd. 
						
						
					 | 
					
						2020-06-10 17:54:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						53f0f97273
					 | 
					
						
						
							
							Added FAQ entry about DPI. Added Japanese font loading example.
						
						
						
						
						
						
					 | 
					
						2020-06-09 17:29:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						40b799023b
					 | 
					
						
						
							
							Docs: Update fonts.md (#2861) + update all references to FONTS.txt
						
						
						
						
						
						
					 | 
					
						2020-06-09 16:56:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Scott
							
						 
					 | 
					
						
						
							
						
						a72754886f
					 | 
					
						
						
							
							Docs: Initial draft of fonts documentation (#2861)
						
						
						
						
						
						
					 | 
					
						2020-06-09 16:56:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						9b3ce494fd
					 | 
					
						
						
							
							Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). (#125)
						
						
						
						
						
						
						
						This change benefits Columns but was primarily made with Tables in mind. 
						
						
					 | 
					
						2020-06-08 23:18:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						84862ec78e
					 | 
					
						
						
							
							ImDrawList, ImDrawListSplitter, Columns: Fixed an issue where changing channels with different TextureId, VtxOffset would incorrectly apply new settings to draw channels. (#3129, #3163)
						
						
						
						
						
						
					 | 
					
						2020-06-08 20:58:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						117d57df5b
					 | 
					
						
						
							
							ImDrawList: Additional comments and extracted bits into ImDrawList::PopUnusedDrawCmd()
						
						
						
						
						
						
					 | 
					
						2020-06-08 20:58:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						f6120f8e16
					 | 
					
						
						
							
							ImDrawList, ImDrawListSplitter, Columns: Fixed an issue where starting a split when current VtxOffset was not zero would lead to draw commands with wrong VtxOffset. (#259
						
						
						
						
						
						
					 | 
					
						2020-06-06 21:31:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						8baa4ccff5
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 | 
					
						2020-06-06 20:31:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								thedmd
							
						 
					 | 
					
						
						
							
						
						e22e3f300a
					 | 
					
						
						
							
							ImDrawList: Fixed an issue when draw command merging or cancelling while crossing the VtxOffset boundary would lead to draw command being emitted with wrong VtxOffset value.  (#3129, #3163, #3232)
						
						
						
						
						
						
					 | 
					
						2020-06-06 18:54:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						53dfccbe4b
					 | 
					
						
						
							
							imgui_freetype: Fix for rare case where FT_Get_Char_Index() succeed but FT_Load_Glyph() fails. (#618)
						
						
						
						
						
						
					 | 
					
						2020-06-04 17:53:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5e976e9b05
					 | 
					
						
						
							
							Title capitalization (#3280)
						
						
						
						
						
						
					 | 
					
						2020-06-03 22:04:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Giovanni Funchal
							
						 
					 | 
					
						
						
							
						
						3f26a07ee1
					 | 
					
						
						
							
							Backends: OpenGL: Fixed loader auto-detection to not interfere with ES2/ES3 defines. (#3246)
						
						
						
						
						
						
					 | 
					
						2020-05-25 18:57:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						5d472c4895
					 | 
					
						
						
							
							Merge branch 'master' into docking + fixes for #3259
						
						
						
						
						
						
						
						# Conflicts:
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp 
						
						
					 | 
					
						2020-05-25 18:32:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						a06eb83359
					 | 
					
						
						
							
							Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. (#3259)
						
						
						
						
						
						
					 | 
					
						2020-05-25 18:15:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rokas Kupstys
							
						 
					 | 
					
						
						
							
						
						6b688561aa
					 | 
					
						
						
							
							CI: Test building without C++ runtime on GCC/Clang.
						
						
						
						
						
						
					 | 
					
						2020-05-25 14:43:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						bb2529dd48
					 | 
					
						
						
							
							Backends: SDL: Report a zero display-size when window is minimized, consistent with other backends.
						
						
						
						
						
						
					 | 
					
						2020-05-25 12:26:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |