omar 
							
						 
					 
					
						
						
							
						
						69d0d33451 
					 
					
						
						
							
							Exposed PushMultiItemsWidths() to imgui_internal.h  
						
						
						
						
					 
					
						2017-09-25 22:45:10 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						24f21bd4d4 
					 
					
						
						
							
							Merge pull request  #1113  from Urmeli0815/ImGuiSelectableFlags_MenuItem  
						
						... 
						
						
						
						MenuItem: only activate on Release, not on Click (nb: and not on ClickRelease to allow opening menu and selecting something with a single click. Windows seems to behave the same, allowing to click and hold to e.g. Open then move cursor, release on Save and save gets activated) 
						
						
					 
					
						2017-09-25 22:13:38 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7e8069dd23 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						
						
						
					 
					
						2017-09-25 22:08:38 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c0547d358d 
					 
					
						
						
							
							Begin: Fixed auto-fit calculation code that predict the presence of ascrollbar so it works in the case size constraints are used. I actually don't need this fix now, but earlier experiment with BeginCombo() required this fix.  
						
						
						
						
					 
					
						2017-09-25 22:04:39 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4b2781fe87 
					 
					
						
						
							
							Begin: Moving some code into a CalcSizeAutoFit() function.  
						
						
						
						
					 
					
						2017-09-25 21:57:42 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0d56140b4a 
					 
					
						
						
							
							BeginCombo(): rework internals a little to make it easier to provide custom combo-like elements relying in BeginCombo().  
						
						... 
						
						
						
						BeginPopupEx() doesn't enforce AlwaysAutoResize flag anymore. 
						
						
					 
					
						2017-09-25 21:45:34 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4b82759598 
					 
					
						
						
							
							SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete.  This will be useful for combo-like popups as well.  
						
						... 
						
						
						
						Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at. 
						
						
					 
					
						2017-09-25 18:25:43 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0a55573288 
					 
					
						
						
							
							Begin(): Minor tidying up of flow  
						
						
						
						
					 
					
						2017-09-25 15:48:52 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9f34925b2a 
					 
					
						
						
							
							Window: Tweaked ApplySizeFullWithConstraint() -> CalcSizeFullWithConstraint() so it can be used without side-effect  
						
						
						
						
					 
					
						2017-09-25 13:23:25 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0a5fb24f10 
					 
					
						
						
							
							Popups: Exposing a little more of popups internals in imgui_internals.h  
						
						
						
						
					 
					
						2017-09-25 12:52:06 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						b9c185402e 
					 
					
						
						
							
							Nav: minor tidying up NavUpdate() to use a local variables, easier to test replacing g.NavWindow with g NavMoveResultWindow for navigation accross flattened child windows.  
						
						
						
						
					 
					
						2017-09-20 23:58:56 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						113b2467cd 
					 
					
						
						
							
							Minor bits. Reduce usage of GImGui multiple times in same function.  
						
						
						
						
					 
					
						2017-09-20 23:02:06 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						479e532f18 
					 
					
						
						
							
							ColorEdit: fixed weird ternary pattern that makes some compiler warning (fair)  
						
						
						
						
					 
					
						2017-09-18 21:41:49 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f24b5f71ca 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						
						
						
					 
					
						2017-09-18 15:35:47 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						79ce9b74d5 
					 
					
						
						
							
							BeginTooltipEx() internal tweaks  
						
						
						
						
					 
					
						2017-09-18 15:35:00 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						44e8d94aba 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						
						
						
					 
					
						2017-09-18 15:32:31 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						105f3b14e4 
					 
					
						
						
							
							Merge branch 'master' into styles  
						
						
						
						
					 
					
						2017-09-18 15:11:51 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9693fd5351 
					 
					
						
						
							
							PushStyleVar/PopStyleVar: internal tweaks  
						
						
						
						
					 
					
						2017-09-18 15:07:22 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7c9e38f60a 
					 
					
						
						
							
							Style: Moving code in a function to make incoming diff easier to parse.  
						
						
						
						
					 
					
						2017-09-18 15:06:54 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						709653c330 
					 
					
						
						
							
							Merge branch 'master' into styles  
						
						
						
						
					 
					
						2017-09-18 15:03:25 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6c91a1ef7f 
					 
					
						
						
							
							Minor comments  
						
						
						
						
					 
					
						2017-09-17 23:35:39 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						052999a6ab 
					 
					
						
						
							
							More consistently uses "Dear ImGui"  
						
						
						
						
					 
					
						2017-09-15 01:31:41 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						54d30d758f 
					 
					
						
						
							
							Implicit "Debug" window uses a "Debug##Default" identifier to allow the user creating such window with custom flags  
						
						
						
						
					 
					
						2017-09-12 13:16:27 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						62d7fa4324 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 
					
						2017-09-06 20:33:39 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f63c03c464 
					 
					
						
						
							
							Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.  
						
						
						
						
					 
					
						2017-09-06 20:28:36 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						51fcef0c21 
					 
					
						
						
							
							BeginCombo() tweaks, merged from Navigation branch.  
						
						
						
						
					 
					
						2017-09-06 19:31:50 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5c4fda0fbc 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 
					
						2017-09-06 19:17:51 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						2169bf6895 
					 
					
						
						
							
							Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). ( #1317 )  
						
						
						
						
					 
					
						2017-09-06 17:25:36 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						790605e359 
					 
					
						
						
							
							Minor comments + renaming internal fields  
						
						
						
						
					 
					
						2017-09-06 17:20:54 +02:00 
						 
				 
			
				
					
						
							
							
								Václav Patejdl 
							
						 
					 
					
						
						
							
						
						e1a7aa41cb 
					 
					
						
						
							
							Improved ColorPicker hue wheel color interpolation  
						
						
						
						
					 
					
						2017-09-05 16:31:54 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						2600b28f5d 
					 
					
						
						
							
							Begin(): fixed calling Begin() more than once per frame setting window_just_activated_by_user which in turn would set Appearing to true for that frame.  
						
						
						
						
					 
					
						2017-09-04 13:29:57 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6400f2900a 
					 
					
						
						
							
							Begin(): renamed locals.  
						
						
						
						
					 
					
						2017-09-04 13:26:46 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a9c6a0f6ec 
					 
					
						
						
							
							Begin(): Removed unnecessary code (at the time of 1.18 commit  e9e0e36f98, CursorPos was used to compute SizeContentsFit and this was necessary)  
						
						
						
						
					 
					
						2017-09-04 13:24:45 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						89cae37b49 
					 
					
						
						
							
							Begin(): Tidying up some code, should be a no-op.  
						
						
						
						
					 
					
						2017-09-04 13:05:20 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						8fbe8709f9 
					 
					
						
						
							
							TODO, minor tweak  
						
						
						
						
					 
					
						2017-09-04 13:03:04 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e8dbf1c795 
					 
					
						
						
							
							Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api.  
						
						
						
						
					 
					
						2017-09-01 22:10:13 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5658675e9d 
					 
					
						
						
							
							Combo: Removed unnecessary ClearActiveId() call (from era where active combo stored an id, now we just use popup functionality)  
						
						
						
						
					 
					
						2017-09-01 21:58:58 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						804ee78731 
					 
					
						
						
							
							Added IsWindowAppearing().  
						
						
						
						
					 
					
						2017-09-01 21:55:59 +02:00 
						 
				 
			
				
					
						
							
							
								Branimir Karadžić 
							
						 
					 
					
						
						
							
						
						670d40642f 
					 
					
						
						
							
							Fixed C4267 conversion from size_t to int.  
						
						
						
						
					 
					
						2017-09-01 14:42:49 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6a1ba317c7 
					 
					
						
						
							
							Demo: Minor coding style tweaks so bgfx copy needs less patching.  
						
						
						
						
					 
					
						2017-08-29 19:05:56 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						97a40e74fb 
					 
					
						
						
							
							Nav: Fixed bad merge of  6def01be5d so the bug fixed in  #840  wasn't fully fixed in Nav branch.  
						
						
						
						
					 
					
						2017-08-29 18:45:58 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						96d2942373 
					 
					
						
						
							
							InputText: Merged bits from Navigation branch (inc. g.ActiveIdIsJustActivated is only set on the toggle).  
						
						
						
						
					 
					
						2017-08-29 18:40:14 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9a0171b803 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 
					
						2017-08-29 18:29:44 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						35e4fa7b85 
					 
					
						
						
							
							Merged from Navigation branch (DragBehavior)  
						
						
						
						
					 
					
						2017-08-29 18:21:36 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6cca4025ee 
					 
					
						
						
							
							Merge from Navigation branch:  6aa8019763 
						
						
						
						
					 
					
						2017-08-29 17:56:53 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ddf41b0398 
					 
					
						
						
							
							Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl.  
						
						
						
						
					 
					
						2017-08-29 17:27:19 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						550dc09998 
					 
					
						
						
							
							Merged from Navigation branch (misc)  
						
						
						
						
					 
					
						2017-08-29 17:12:18 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						aef041f948 
					 
					
						
						
							
							Merged from Navigation branch  
						
						
						
						
					 
					
						2017-08-29 17:09:56 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c9298c2657 
					 
					
						
						
							
							Merged from Navigation branch:  
						
						... 
						
						
						
						f71cdd13b7c816e6c742#323 , #246 ) 
					
						2017-08-29 17:09:44 +08:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						287a4b6b38 
					 
					
						
						
							
							Merged from Navigation branch:  5cac4926c8 fix title bar color of window under a modal window.  
						
						
						
						
					 
					
						2017-08-29 16:52:37 +08:00