omar
							
						 
					 | 
					
						
						
							
						
						28a76af185
					 | 
					
						
						
							
							Internal: DrawData: Tidying, renaming.
						
						
						
						
						
						
					 | 
					
						2018-01-15 20:12:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						a77913054f
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 | 
					
						2018-01-15 18:02:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1182174d81
					 | 
					
						
						
							
							Internals: DrawData: We don't need an intermediate layer for popups.
						
						
						
						
						
						
					 | 
					
						2018-01-15 18:00:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						038453258e
					 | 
					
						
						
							
							Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
						
						
						
						
						
						
					 | 
					
						2018-01-15 17:48:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						061d8df033
					 | 
					
						
						
							
							MIssing IMGUI_API for a type with non-inline methods.
						
						
						
						
						
						
					 | 
					
						2018-01-15 17:48:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						06eef2ce6f
					 | 
					
						
						
							
							Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
						
						
						
						
						
						
					 | 
					
						2018-01-15 17:48:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						514d30d8cd
					 | 
					
						
						
							
							MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345.
						
						
						
						
						
						
					 | 
					
						2018-01-14 14:13:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						db63e71f13
					 | 
					
						
						
							
							Internals: Exposed SetCurrentFont() in imgui_internal.h
						
						
						
						
						
						
					 | 
					
						2018-01-12 20:07:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1493de4f81
					 | 
					
						
						
							
							Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
						
						
						
						
						
						
					 | 
					
						2018-01-12 19:53:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						c85d7d6e49
					 | 
					
						
						
							
							Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787)
						
						
						
						
						
						
					 | 
					
						2018-01-12 19:28:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						c9be7d7254
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 | 
					
						2018-01-12 19:21:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						0a98202714
					 | 
					
						
						
							
							Nav: Standardized FIXME-NAV marker.
						
						
						
						
						
						
					 | 
					
						2018-01-12 19:13:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						16285603f2
					 | 
					
						
						
							
							Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless)
						
						
						
						
						
						
					 | 
					
						2018-01-12 19:11:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						919fc548ad
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
					 | 
					
						2018-01-10 18:58:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						0cabd81071
					 | 
					
						
						
							
							Internals: Rect: Added ClipWillFull helper + comments on variations.
						
						
						
						
						
						
					 | 
					
						2018-01-10 14:43:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						92d75c44bc
					 | 
					
						
						
							
							Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience.
						
						
						
						
						
						
					 | 
					
						2018-01-10 14:43:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3f4eccf154
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 | 
					
						2018-01-07 16:22:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3fc7cf190d
					 | 
					
						
						
							
							OpenPopup(): Always reopen existing popup. Removed OpenPopupEx() bool reopen_existing which is always true. This also makes the public API on par with OpenPopupEx(). (#1497, #1533)
						
						
						
						
						
						
					 | 
					
						2018-01-07 16:20:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						deab2ab015
					 | 
					
						
						
							
							Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497)
						
						
						
						
						
						
					 | 
					
						2018-01-07 16:15:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						69ff65f054
					 | 
					
						
						
							
							Internals: Popup: Renaming fields.
						
						
						
						
						
						
					 | 
					
						2018-01-07 16:11:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3678307cd9
					 | 
					
						
						
							
							Popup, Menus: Tweaks and comments.
						
						
						
						
						
						
					 | 
					
						2018-01-07 15:56:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						369189b675
					 | 
					
						
						
							
							Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
						
						
						
						
						
						
					 | 
					
						2018-01-07 15:40:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						a34490239c
					 | 
					
						
						
							
							Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
						
						
						
						
						
						
					 | 
					
						2018-01-07 14:03:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						95b773370f
					 | 
					
						
						
							
							Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later.
						
						
						
						
						
						
						
						This reverts commit 007f4034c9. 
						
						
					 | 
					
						2018-01-05 17:40:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						007f4034c9
					 | 
					
						
						
							
							Internals: Added LastActiveId, LastActiveIdTimer. (#1537)
						
						
						
						
						
						
					 | 
					
						2018-01-05 15:33:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						29c194b2a4
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 | 
					
						2018-01-03 20:47:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4fc9f44073
					 | 
					
						
						
							
							Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
						
						
						
						
						
						
					 | 
					
						2018-01-03 20:46:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						b2ec0741f1
					 | 
					
						
						
							
							Internals: Settings api tweaks
						
						
						
						
						
						
					 | 
					
						2018-01-03 20:45:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						2b8224692e
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
					 | 
					
						2018-01-03 20:26:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f9b2058d5a
					 | 
					
						
						
							
							Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
						
						
						
						
						
						
					 | 
					
						2018-01-03 14:35:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						96ccc484f9
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
						
						# Conflicts:
#	imgui_internal.h 
						
						
					 | 
					
						2018-01-03 12:33:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3c6fbe0849
					 | 
					
						
						
							
							Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
						
						
						
						
						
						
					 | 
					
						2018-01-03 12:31:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						7fcbd45500
					 | 
					
						
						
							
							Internals: NextWindow: Renamed, moved functions to member.
						
						
						
						
						
						
					 | 
					
						2018-01-03 12:28:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e339949de1
					 | 
					
						
						
							
							Internals: NextWindow: Using ImGuiCond for consistency.
						
						
						
						
						
						
					 | 
					
						2018-01-03 12:22:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						04b44398eb
					 | 
					
						
						
							
							Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
						
						
						
						
						
						
					 | 
					
						2018-01-03 12:12:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						7a15fc8de5
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
					 | 
					
						2017-12-29 18:28:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6ec00a366a
					 | 
					
						
						
							
							Internals: ImRect: Minor formatting tweaks.
						
						
						
						
						
						
					 | 
					
						2017-12-29 18:28:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						fbf2435f38
					 | 
					
						
						
							
							Exposed IM_OFFSETOF() helper in imgui.h
						
						
						
						
						
						
					 | 
					
						2017-12-29 18:16:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						2dd2ca0096
					 | 
					
						
						
							
							Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side.
						
						
						
						
						
						
						
						Removed internal corresponding ImRect::GetClosestPoint() for now.
Essentially revert dcaafffe0e. 
						
						
					 | 
					
						2017-12-29 17:59:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						c4e6d622c1
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui.h 
						
						
					 | 
					
						2017-12-29 13:39:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						49eed6e2d1
					 | 
					
						
						
							
							Version 1.54 WIP
						
						
						
						
						
						
					 | 
					
						2017-12-28 15:17:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						436cad4bca
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.h 
						
						
					 | 
					
						2017-12-26 15:37:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e916310b2e
					 | 
					
						
						
							
							Version 1.53
						
						
						
						
						
						
					 | 
					
						2017-12-25 17:41:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						67191badc2
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
					 | 
					
						2017-12-23 23:10:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						bb8dfe4a34
					 | 
					
						
						
							
							Fixed incorrect IM_DELETE macro (9cda86d55a) (#1517, #484, #504)
						
						
						
						
						
						
					 | 
					
						2017-12-23 23:10:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ffb4f6ca8c
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
					 | 
					
						2017-12-23 16:27:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9cda86d55a
					 | 
					
						
						
							
							Internals: Added IM_NEW, IM_DELETE helper macros (#1517, #484, #504)
						
						
						
						
						
						
					 | 
					
						2017-12-23 16:24:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1f26652944
					 | 
					
						
						
							
							Various zealous warning fixes (thanks Clang).
						
						
						
						
						
						
					 | 
					
						2017-12-23 14:07:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						287380261c
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 | 
					
						2017-12-21 19:55:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						c8c872c753
					 | 
					
						
						
							
							Internals: String functions uses size_t in their signature
						
						
						
						
						
						
					 | 
					
						2017-12-21 19:49:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |