Jason Wilkins
							
						 
					 | 
					
						
						
							
						
						e605f21797
					 | 
					
						
						
							
							TreePush with zero arguments was ambiguous. Resolved by making it call TreePush(const void*)
						
						
						
						
						
						
					 | 
					
						2017-11-19 12:36:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9a44d447cd
					 | 
					
						
						
							
							NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. (#1423 etc.)
						
						
						
						
						
						
					 | 
					
						2017-11-19 12:06:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						538a704143
					 | 
					
						
						
							
							NewFrame(): using literal strings in the most-frequently firing IM_ASSERT expression to increase the odd of programmers seeing them (especially those who don't use a debugger).
						
						
						
						
						
						
					 | 
					
						2017-11-19 12:00:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9289e8055c
					 | 
					
						
						
							
							Merge pull request #1445 from franciscod/uninitialized_o3_werror
						
						
						
						
						
						
						
						ImFontAtlas: Fix maybe-uninitialized warning. 
						
						
					 | 
					
						2017-11-19 00:53:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4cdd998be8
					 | 
					
						
						
							
							Demo: Fix warning "format not a string literal and no format arguments" for over-zealous compilers settings. (#1450, #1451)
						
						
						
						
						
						
					 | 
					
						2017-11-19 00:49:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						d323e8cca2
					 | 
					
						
						
							
							Fixed Style merge for nav branch (#707, #787)
						
						
						
						
						
						
					 | 
					
						2017-11-19 00:47:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						d211a0e338
					 | 
					
						
						
							
							Merge branch 'master' into navigation (with style breakable)
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp 
						
						
					 | 
					
						2017-11-19 00:39:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4022ada843
					 | 
					
						
						
							
							Merge branch 'master' into drag_and_drop
						
						
						
						
						
						
					 | 
					
						2017-11-19 00:36:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4daf377c9b
					 | 
					
						
						
							
							Added comment about TextUnformatted(). (#1450)
						
						
						
						
						
						
					 | 
					
						2017-11-19 00:32:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						8a7f03cbf9
					 | 
					
						
						
							
							Combo: Offset popup position by border size so that a double border isn't so visible. (#707)
						
						
						
						
						
						
					 | 
					
						2017-11-19 00:29:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						d7af1a218e
					 | 
					
						
						
							
							Style: Added PopupRounding setting. (#1112)
						
						
						
						
						
						
					 | 
					
						2017-11-19 00:29:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						067605052d
					 | 
					
						
						
							
							Fix IsItemHovered() returning true for non-title bar hidden items that are clipped due to window collapsing logic. Fix 27fd1b913b. (#823)
						
						
						
						
						
						
					 | 
					
						2017-11-19 00:29:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6f7b1bf2e1
					 | 
					
						
						
							
							Internals: Renamed ImGuiWindow::Accessed to WriteAccessed.
						
						
						
						
						
						
					 | 
					
						2017-11-19 00:29:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						0e4f1df1a4
					 | 
					
						
						
							
							Style: Made changes to Classic style (!!!). Tweaked Dark style. (#707)
						
						
						
						
						
						
					 | 
					
						2017-11-19 00:29:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						0a61b7195c
					 | 
					
						
						
							
							Style: Added a default StyleColorsLight(). (#707)
						
						
						
						
						
						
					 | 
					
						2017-11-19 00:29:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e7e81b265d
					 | 
					
						
						
							
							Demo: Tweaks.
						
						
						
						
						
						
					 | 
					
						2017-11-18 23:44:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						58345b11e1
					 | 
					
						
						
							
							Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. (#707)
						
						
						
						
						
						
					 | 
					
						2017-11-18 23:44:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						1c41603b31
					 | 
					
						
						
							
							Style Editor: Using local storage so Save/Revert button made some more sense without code passing its storage. Tweaked layout, added horizontal scroll bar, Fixed Save/Revert button to be always accessible. (fix #1211)
						
						
						
						
						
						
					 | 
					
						2017-11-18 23:44:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						c1b5eab868
					 | 
					
						
						
							
							Style Editor: Sneakily adding a combo box to change colors (#707)
						
						
						
						
						
						
					 | 
					
						2017-11-18 23:18:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						331eac511e
					 | 
					
						
						
							
							Style: Dark: Tweaks + setting BorderShadow correctly.
						
						
						
						
						
						
					 | 
					
						2017-11-18 19:08:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						29e0078b66
					 | 
					
						
						
							
							Internals: Window minor internal renaming + added WindowRounding latch.
						
						
						
						
						
						
					 | 
					
						2017-11-18 19:06:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						bd4bc929ce
					 | 
					
						
						
							
							Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.
						
						
						
						
						
						
					 | 
					
						2017-11-18 18:28:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4e62118b61
					 | 
					
						
						
							
							Merge pull request #1448 from codecat/minor-fixes
						
						
						
						
						
						
						
						Examples: DirectX: fix wrong comment in dx implementation headers 
						
						
					 | 
					
						2017-11-18 14:22:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Codecat
							
						 
					 | 
					
						
						
							
						
						979fe30a6f
					 | 
					
						
						
							
							Fix wrong comment in dx implementation headers
						
						
						
						
						
						
					 | 
					
						2017-11-18 13:56:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						da2be7bbdc
					 | 
					
						
						
							
							Style: ScaleAllSizes() helper rounds down every values so they are aligned on integers.
						
						
						
						
						
						
					 | 
					
						2017-11-17 21:29:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Francisco Demartino
							
						 
					 | 
					
						
						
							
						
						f5871c0b92
					 | 
					
						
						
							
							fix uninitialized atlas packing context
						
						
						
						
						
						
					 | 
					
						2017-11-16 21:45:21 -03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						834fa52c8e
					 | 
					
						
						
							
							Columns: Added ImGuiColumnsFlags_GrowParentContentsSize to internal API to restore old content sizes behavior. (#1444, #125)
						
						
						
						
						
						
					 | 
					
						2017-11-16 17:34:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						7746dd104c
					 | 
					
						
						
							
							Merge branch 'master' into drag_and_drop
						
						
						
						
						
						
					 | 
					
						2017-11-16 13:28:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						44c590393c
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
					 | 
					
						2017-11-16 13:28:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						29d962069d
					 | 
					
						
						
							
							Internals: Updating condition/allow flags with a function.
						
						
						
						
						
						
					 | 
					
						2017-11-16 13:28:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						4ad414c8d4
					 | 
					
						
						
							
							Internals: Window: Store whether the windows has a close button (we need that info for window/tabs dropping preview calculation)
						
						
						
						
						
						
					 | 
					
						2017-11-16 13:23:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						7c4be0a000
					 | 
					
						
						
							
							Internals: Added BringWindowToFront(), BringWindowToBack() helpers.
						
						
						
						
						
						
					 | 
					
						2017-11-16 13:11:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6817f3a3d9
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
					 | 
					
						2017-11-15 23:44:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						e9a7e73bba
					 | 
					
						
						
							
							Windows with MenuBar have a larger minimum height to avoid artefacts (I fixed most of the vertical/horizontal artefacts, but the ones in rounded corners were too hard to fix).
						
						
						
						
						
						
					 | 
					
						2017-11-15 23:42:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f36037b384
					 | 
					
						
						
							
							Menu: Fixed minor rendering issues on the right size with rounded window when resizing a window small.
						
						
						
						
						
						
					 | 
					
						2017-11-15 23:38:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						9b82d9fbef
					 | 
					
						
						
							
							Scrollbar: Minor graphical fix for when scrollbar don't have enough visible space to display the full grab.
						
						
						
						
						
						
					 | 
					
						2017-11-15 23:14:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						f5bdf443c9
					 | 
					
						
						
							
							Minor comments, tweaks
						
						
						
						
						
						
					 | 
					
						2017-11-15 22:37:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5ea6e80da1
					 | 
					
						
						
							
							Make it possible to use SetNextWindowPos() on a child window. Useful internally.
						
						
						
						
						
						
					 | 
					
						2017-11-15 22:23:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						5027311e7f
					 | 
					
						
						
							
							Drag and drop: Standardizing payload types as defines. (#143)
						
						
						
						
						
						
					 | 
					
						2017-11-15 22:23:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						44b761b308
					 | 
					
						
						
							
							Merge branch 'master' into drag_and_drop
						
						
						
						
						
						
					 | 
					
						2017-11-15 14:41:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						27fd1b913b
					 | 
					
						
						
							
							Made it guaranteed by API that after calling Begin() the last Item represent the title bar. (#823)
						
						
						
						
						
						
					 | 
					
						2017-11-15 14:35:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ae060b1d67
					 | 
					
						
						
							
							Merge branch 'master' into drag_and_drop
						
						
						
						
						
						
					 | 
					
						2017-11-15 10:24:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						64031852de
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
					 | 
					
						2017-11-14 23:17:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						64e79035d5
					 | 
					
						
						
							
							Scrollbar flicker fix for menus/popups (fixes 4d00dd8326 and 2df8fa95df). Hopefully right this time.
						
						
						
						
						
						
					 | 
					
						2017-11-14 23:17:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						6001d9c7a4
					 | 
					
						
						
							
							Columns: Clipping columns borders on Y axis on CPU because some GPU drivers appears to be unhappy with triangle spanning large regions (not sure why tbh). (#125)
						
						
						
						
						
						
						
						Demo: Columns: Adding a billion of extra lines and using clipper. 
						
						
					 | 
					
						2017-11-14 22:41:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						0858c3d7cb
					 | 
					
						
						
							
							Demo: Custom Rendering: Fixed clipping rectangle extruding out of parent window.
						
						
						
						
						
						
					 | 
					
						2017-11-14 22:21:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						ffad688fc8
					 | 
					
						
						
							
							Drag and Drop: Added payload->IsPreview() to user can render their custom preview while handling overlapping drop targets. (#143)
						
						
						
						
						
						
					 | 
					
						2017-11-14 22:11:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						852ece3a0e
					 | 
					
						
						
							
							Fixed build (3e06450d27 not meant for master branch, but ok)
						
						
						
						
						
						
					 | 
					
						2017-11-13 16:04:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						2275cb8b83
					 | 
					
						
						
							
							Merge branch 'master' into navigation
						
						
						
						
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 | 
					
						2017-11-13 15:19:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								omar
							
						 
					 | 
					
						
						
							
						
						3e06450d27
					 | 
					
						
						
							
							Internals: Added ArrowButton() helper.
						
						
						
						
						
						
					 | 
					
						2017-11-13 15:18:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |