ocornut
							
						 
					 | 
					
						
						
							
						
						34077c0140
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 | 
					
						2020-09-01 12:07:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						13f718337a
					 | 
					
						
						
							
							Internals: Added support for overriding locale decimal point, undocumented. (#2278) + Misc doc update.
						
						
						
						
						
						
						
						Doc: Mention IMGUI_VERSION_NUM in recent api breaking changes + textwrap some demo code. 
						
						
					 | 
					
						2020-08-28 18:38:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						4448734041
					 | 
					
						
						
							
							ImVector: added max_size() to facilitate usage with sol2 binding generator (#3429)
						
						
						
						
						
						
					 | 
					
						2020-08-26 11:03:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						ad8fdc917f
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp 
						
						
					 | 
					
						2020-08-20 22:42:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						9b50e691ed
					 | 
					
						
						
							
							TreeNode: Made clicking on arrow toggle toggle the open state on the Mouse Down event. Amend 05420ea2c.
						
						
						
						
						
						
					 | 
					
						2020-08-20 22:38:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						9262609eaf
					 | 
					
						
						
							
							Version 1.79 WIP
						
						
						
						
						
						
					 | 
					
						2020-08-20 16:46:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						fc9ccad6b9
					 | 
					
						
						
							
							InputText: Add ImGuiInputTextFlags_CallbackEdit, selection helpers in ImGuiInputTextCallbackData(). Add simple InputText() callbacks demo.
						
						
						
						
						
						
					 | 
					
						2020-08-20 11:25:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						5dc5610ad5
					 | 
					
						
						
							
							Docs: TODO, FAQ
						
						
						
						
						
						
					 | 
					
						2020-08-20 11:20:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						05bc204dbd
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.h 
						
						
					 | 
					
						2020-08-18 17:51:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						95c99aaa4b
					 | 
					
						
						
							
							Version 1.78
						
						
						
						
						
						
					 | 
					
						2020-08-18 17:50:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						c6b01e8e1d
					 | 
					
						
						
							
							Drag, Sliders: Merged ImGuiDragFlags back into ImGuiSliderFlags.  (#3361, #1823, #1316, #642, #1829, #3209)
						
						
						
						
						
						
						
						Technically API breaking (but ImGuiDragFlags were pushed on master 16 hours ago) 
						
						
					 | 
					
						2020-08-18 17:02:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ocornut
							
						 
					 | 
					
						
						
							
						
						25a9209b75
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
#	imgui_widgets.cpp 
						
						
					 | 
					
						2020-08-17 23:29:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ben Carter
							
						 
					 | 
					
						
						
							
						
						fa279a6aa0
					 | 
					
						
						
							
							Drags, Sliders: Added deadzone to make selecting 0.0 on linear sliders easier, slider navigation delta accumulation. (#3361, #1823, #1316, #642)
						
						
						
						
						
						
					 | 
					
						2020-08-17 22:10:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f75b29e7be
					 | 
					
						
						
							
							Drags, Sliders: Added ImGuiDragFlags_NoInput/ImGuiSliderFlags_NoInput to disable turning widget into a text input with CTRL+Click or Nav Enter.
						
						
						
						
						
						
					 | 
					
						2020-08-17 22:10:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						8018623c5b
					 | 
					
						
						
							
							Drags, Sliders: Added ImGuiDragFlags_NoRoundToFormat / ImGuiSliderFlags_NoRoundToFormat flags (#642)
						
						
						
						
						
						
					 | 
					
						2020-08-17 22:10:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						170d02bd99
					 | 
					
						
						
							
							Drags, Sliders: Added ImGuiDragFlags_ClampOnInput/ImGuiSliderFlags_ClampOnInput flags to force clamping value when using CTRL+Click to type in a value manually. (#1829, #3209)
						
						
						
						
						
						
					 | 
					
						2020-08-17 22:10:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						7607aea018
					 | 
					
						
						
							
							Drags, Sliders: Removed power features. Old entry points will pass-through if power=1.0f, otherwise assert + safe fallback. Remove 3 redirection functions (#3361, #1823, #1316, #642)
						
						
						
						
						
						
					 | 
					
						2020-08-17 22:10:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						43c099f31e
					 | 
					
						
						
							
							Drags, Sliders: Logarithmic: Moved flags to internals, allowing 1.0f to pass by. (#3361, #1823, #1316, #642)
						
						
						
						
						
						
					 | 
					
						2020-08-17 22:10:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						152dae9e2a
					 | 
					
						
						
							
							Drags, Sliders: Logarithmic: Split back flags into drag/slider flags. Moved to an obsolete section. (#3361, #1823, #1316, #642)
						
						
						
						
						
						
					 | 
					
						2020-08-17 22:10:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ben Carter
							
						 
					 | 
					
						
						
							
						
						9f98b4e7f2
					 | 
					
						
						
							
							Drags, Sliders: Logarithmic: Added logarithmic mode support to drag widgets, extended API to add flags to drag/sliders (#3361, #1823, #1316, #642)
						
						
						
						
						
						
					 | 
					
						2020-08-17 22:10:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						2c13a74a9d
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	imgui.cpp 
						
						
					 | 
					
						2020-08-10 11:35:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						473a01adb0
					 | 
					
						
						
							
							Scrolling: Avoid SetScroll, SetScrollFromPos functions from snapping on the edge of scroll limits. (#3379) + Demo: Rename "Layout" to "Layout & Scrolling".
						
						
						
						
						
						
					 | 
					
						2020-08-05 17:09:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						963839373c
					 | 
					
						
						
							
							Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call).
						
						
						
						
						
						
					 | 
					
						2020-08-03 21:31:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						de1588928b
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 | 
					
						2020-08-03 19:54:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4929a8e4a5
					 | 
					
						
						
							
							InvisibleButton: Made public a small selection of ImGuiButtonFlags (previously in imgui_internal.h) and allowed to pass them to InvisibleButton().
						
						
						
						
						
						
					 | 
					
						2020-08-03 18:45:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5d87941451
					 | 
					
						
						
							
							Fixed ImFontConfig::GlyphExtraSpacing and ImFontConfig::PixelSnapH settings being pulled from the merged/target font settings when merging fonts, instead of being pulled from the source font settings.
						
						
						
						
						
						
					 | 
					
						2020-08-02 12:20:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						218ff3a2a5
					 | 
					
						
						
							
							Internals: Backport one ->WasActive test in NavRestoreLastChildNavWindow() from 9bf6509c6 + minor/shallow bits from docking branch.
						
						
						
						
						
						
					 | 
					
						2020-07-29 15:11:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						fdc526e8f8
					 | 
					
						
						
							
							Stop advertisting for Drag v_min>v_max which was introduced in 1.73 likely for 0537ac00 then made unnecessary with 32c33c66, added undocumented ImGuiItemFlags_ReadOnly as possible replacement (unused), (#211)
						
						
						
						
						
						
					 | 
					
						2020-07-23 18:19:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e223bd8177
					 | 
					
						
						
							
							ImDrawList: changed AddCircle(), AddCircleFilled() default num_segments from 12 to 0.
						
						
						
						
						
						
					 | 
					
						2020-07-16 22:25:56 +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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						78d6bdf080
					 | 
					
						
						
							
							Texture-based thick lines: Remove unnecessary indirection in fetching UV data, removed lerp call, renames, tweaks.
						
						
						
						
						
						
					 | 
					
						2020-07-08 17:38:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Omar
							
						 
					 | 
					
						
						
							
						
						a07c8b6999
					 | 
					
						
						
							
							Texture-based thick lines: Fixes for AddCustomRect api, add IMGUI_HAS_TEXLINES define (temporarily) to facilitate working with test cases, Demo allows growing FrameBorderSize for testing
						
						
						
						
						
						
					 | 
					
						2020-07-08 17:38:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ben Carter
							
						 
					 | 
					
						
						
							
						
						403bf45245
					 | 
					
						
						
							
							Texture-based thick lines: Allow interpolation between textures for non-integer line widths
						
						
						
						
						
						
					 | 
					
						2020-07-08 17:38:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						222b7ddbfa
					 | 
					
						
						
							
							Texture-based thick lines: Tweaks, fix for truetype builder.
						
						
						
						
						
						
					 | 
					
						2020-07-08 17:38:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ben Carter
							
						 
					 | 
					
						
						
							
						
						741ab74b55
					 | 
					
						
						
							
							Texture-based thick lines: Improvements to code for drawing anti-aliased lines using textures
						
						
						
						
						
						
						
						Moved line width into a constant
Removed test code (now in imgui-tests)
Improved matching between geometry and texture rendering at non-integer sizes 
						
						
					 | 
					
						2020-07-08 17:38:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ben Carter
							
						 
					 | 
					
						
						
							
						
						1d3c3070d8
					 | 
					
						
						
							
							Texture-based thick lines: Initial version of AA line drawing using textures (press SHIFT to enable)
						
						
						
						
						
						
					 | 
					
						2020-07-08 17:38:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ben Carter
							
						 
					 | 
					
						
						
							
						
						8e4046e13b
					 | 
					
						
						
							
							Atlas build use GetCustomRectByIndex() + comments, rename, and shallow merge from tex_antialiasing_lines branch.
						
						
						
						
						
						
					 | 
					
						2020-07-08 17:25:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						fc9d6b6cb5
					 | 
					
						
						
							
							Docking: Added experimental flags to perform more docking filtering and disable resize per axis. Designed for toolbar patterns.
						
						
						
						
						
						
						
						The local/shared flags specs, saving and inheriting rules are pretty inconsistent at the moment. 
						
						
					 | 
					
						2020-06-30 19:55:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						a1d2c6fad9
					 | 
					
						
						
							
							Fixed invalid comment (#3327)
						
						
						
						
						
						
					 | 
					
						2020-06-30 19:00:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ab4ef822f0
					 | 
					
						
						
							
							Version 1.78 WIP
						
						
						
						
						
						
					 | 
					
						2020-06-30 16:56:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						90ea7e2f2f
					 | 
					
						
						
							
							Merge branch 'master' into docking
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h 
						
						
					 | 
					
						2020-06-30 16:43:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rokas Kupstys
							
						 
					 | 
					
						
						
							
						
						0738611559
					 | 
					
						
						
							
							Misc: Bunch of code formatting changes suggested by a pass running 'astyle'
						
						
						
						
						
						
					 | 
					
						2020-06-30 16:37:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						dca7c3c629
					 | 
					
						
						
							
							TestEngine: Added hook to notify test engine of a removed imgui context.
						
						
						
						
						
						
					 | 
					
						2020-06-29 20:16:55 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						122febcdbf
					 | 
					
						
						
							
							IO: Added storage for PenPressure (unused by core library, to facilitate experiments) (#2372)
						
						
						
						
						
						
					 | 
					
						2020-06-29 15:03:11 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |