omar 
							
						 
					 
					
						
						
							
						
						63cd2bf9b1 
					 
					
						
						
							
							Removed obsolete comment.  
						
						
						
						
					 
					
						2017-10-05 09:40:06 -07:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						3ddcdcf6e7 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						
						
						
					 
					
						2017-10-04 18:46:09 -07:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						67ac7da30f 
					 
					
						
						
							
							Styles: Added ImGuiStyle::ScaleAllSizes(float) helper to make it easier to have application transition to e.g. High DPI with a matching style.  
						
						
						
						
					 
					
						2017-10-04 18:13:57 -07:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a56b71e866 
					 
					
						
						
							
							Nav: Added code to render thin highlight type. ( #787 )  
						
						
						
						
					 
					
						2017-10-04 10:44:27 -07:00 
						 
				 
			
				
					
						
							
							
								matiTechno 
							
						 
					 
					
						
						
							
						
						b36a043bbf 
					 
					
						
						
							
							typo  
						
						
						
						
					 
					
						2017-10-04 11:09:21 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						6ea90af6b7 
					 
					
						
						
							
							Nav: Highlight clipped within host window then extruded out. ( #787 )  
						
						
						
						
					 
					
						2017-10-03 13:53:17 -07:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						cb4e6c8212 
					 
					
						
						
							
							Nav: Selectable(): activating selectable also sets NavId + removed the MouseDelta test (added in  43ee5d73e9,  #323 ) as I don't think it is needed. ( #787 )  
						
						
						
						
					 
					
						2017-10-03 13:44:48 -07:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						64a51327d3 
					 
					
						
						
							
							Nav: Added NavMoveResultParentId internal info to record when the parent/context of a given NavId. Useful for various algorithms (currently looking at range selection stuff) ( #787 )  
						
						
						
						
					 
					
						2017-10-03 13:25:40 -07:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						74da533c93 
					 
					
						
						
							
							Nav: Added NavJustNavigatedId internal info to record when we land on a given item after a navigation request, useful for various algorithms (currently looking at range selection stuff) ( #787 )  
						
						
						
						
					 
					
						2017-10-03 11:22:38 -07:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7f58bb03c1 
					 
					
						
						
							
							Changed the internal name formatting of child windows to use slashes as separator, more readable.  
						
						
						
						
					 
					
						2017-10-02 16:07:34 -07:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						cbc9730798 
					 
					
						
						
							
							Metrics: Draw window bounding boxes when hovering Pos/Size. List all draw layers, trimming empty commands like Render() does.  
						
						
						
						
					 
					
						2017-10-02 16:07:33 -07:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						491edfd8d8 
					 
					
						
						
							
							Nav: Fixed a crash introduced yesterday.  
						
						
						
						
					 
					
						2017-09-30 23:46:23 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0046c618b0 
					 
					
						
						
							
							Nav: Allow to collapse tree nodes with NavLeft and open them with NavRight ( #787 ,  #1079 )  
						
						
						
						
					 
					
						2017-09-30 00:47:07 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ecd72cc0c7 
					 
					
						
						
							
							Nav: Disabled the final axial check when considering candidates in most situations except menubars.  
						
						... 
						
						
						
						It's definitively undesirable inside Menu as we want to catch nav request failures reliably.
I think it may be considered as an option if we find this desirable i some circumstances. Right now ideally I'd remove it totally but with current scoring setup, without it we can't easily reach the Window Close button. (#787 ) 
						
						
					 
					
						2017-09-30 00:26:55 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						88a354585a 
					 
					
						
						
							
							Nav: It's now possible to navigate sibling of a menu-bar while navigating inside one of their child. If a Left<>Right navigation request fails to find a match we forward the request to the root menu.  ( #787 ,  #126 )  
						
						... 
						
						
						
						Currently the sibling menu is isn't automatically opened, that's still left to it (and even that can be anoying in Windows when the first menu-item is a child menu) 
						
						
					 
					
						2017-09-29 23:39:34 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f4e4c38705 
					 
					
						
						
							
							BeginMenu(): fixed logic to distinguish vertical menu from one layed out in a menu bar. Makes MenuItem() in a regular window behave more consistently, and this will be also needed by upcoming menu-navigation changes in the nav branch. ( #126 ,  #787 )  
						
						
						
						
					 
					
						2017-09-29 23:37:14 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9912f7eef8 
					 
					
						
						
							
							BeginMenu(): fixed logic to distinguish vertical menu from one layed out in a menu bar. Makes MenuItem() in a regular window behave more consistently, and this will be also needed by upcoming menu-navigation changes in the nav branch. ( #126 ,  #787 )  
						
						
						
						
					 
					
						2017-09-29 22:19:53 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						cf3b21179b 
					 
					
						
						
							
							Nav: Comments  
						
						
						
						
					 
					
						2017-09-29 20:03:02 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5a9ebeca9e 
					 
					
						
						
							
							Nav: Fix typo from  9712a81f85 
						
						
						
						
					 
					
						2017-09-29 19:49:20 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						bfaa426f7f 
					 
					
						
						
							
							Nav: Minor tidying up (adding local variables to be a little more sane).  
						
						
						
						
					 
					
						2017-09-29 19:48:16 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						8a5a29f0be 
					 
					
						
						
							
							Nav: Renamed internal field.  
						
						
						
						
					 
					
						2017-09-29 19:28:19 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9712a81f85 
					 
					
						
						
							
							Nav: Rectangle rectangle stored per window and per layer as well. Makes things simpler, allows enable us to visualize more data.  
						
						
						
						
					 
					
						2017-09-29 19:26:03 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						54eb4c485e 
					 
					
						
						
							
							Nav: Marked misleading/broken code that will never execute.  
						
						
						
						
					 
					
						2017-09-29 19:15:24 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e3c89aeb10 
					 
					
						
						
							
							Nav: Fixed menuitems/selectable on menu layer (layer 1) from storing themselves in wrong layer of LastNavIds when hovered.causing inconsistencies and bugs when hovering menu with mouse then pressing ALT to return to layer 0).  
						
						... 
						
						
						
						NB: this is not a new bug introduced by the previous commit (which is related to nav layers), bug has been there for a while. (#787 ) 
						
						
					 
					
						2017-09-29 18:24:43 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9737efb2f1 
					 
					
						
						
							
							Nav: Store per-window last nav id also per-layer so we can easily query them for menu navigation code. ( #787 )  
						
						
						
						
					 
					
						2017-09-29 17:58:25 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						8a814487fe 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 
					
						2017-09-29 16:30:43 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						fba9353c60 
					 
					
						
						
							
							BeginMenu: Shuffling braces around to clarify flow  
						
						
						
						
					 
					
						2017-09-29 16:29:00 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						cf308f4039 
					 
					
						
						
							
							Nav: Fixed SetItemDefaultFocus from stealing default focus when we are initializing default focus for a menu bar layer ( #787 )  
						
						
						
						
					 
					
						2017-09-29 00:20:51 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f4398226cc 
					 
					
						
						
							
							Nav: Support for fallback horizontal scrolling with PadLeft/PadRight (nb: fallback scrolling is only used to navigate windows that have no interactive items). ( #787 )  
						
						
						
						
					 
					
						2017-09-29 00:01:26 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						30b1d85962 
					 
					
						
						
							
							Nav: Commiting some better organized Debug helper because this going to stay for a bit.  
						
						
						
						
					 
					
						2017-09-28 23:48:30 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						1f7f54e196 
					 
					
						
						
							
							Removed extraneous test.  
						
						
						
						
					 
					
						2017-09-28 22:00:17 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						df366b230e 
					 
					
						
						
							
							ColorPicker4: Use nav flag to provide a slighly better experience when using navigation ( #787 ,  #346 )  
						
						
						
						
					 
					
						2017-09-28 20:22:30 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						2d859dee4e 
					 
					
						
						
							
							Nav: Added ImGuiItemFlags_NoNav item flag  
						
						
						
						
					 
					
						2017-09-28 19:58:01 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						878fa96896 
					 
					
						
						
							
							Nav: Re-arranged ItemAdd() to maximize early out ( #787 )  
						
						
						
						
					 
					
						2017-09-28 19:57:24 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						dd0855de5c 
					 
					
						
						
							
							ButtonBehavior: Tidying up.  
						
						
						
						
					 
					
						2017-09-28 19:47:45 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4b4e455c40 
					 
					
						
						
							
							Nav: Internal nenaming  
						
						
						
						
					 
					
						2017-09-28 19:41:30 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e0a2a832cd 
					 
					
						
						
							
							Nav: Changed internal flag to NoNavDefaultFocus to be false by allow, and more consistent ( #787 )  
						
						
						
						
					 
					
						2017-09-28 19:18:41 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						af38749ea1 
					 
					
						
						
							
							Nav: Fixed ButtonBehavior mistakenly setting active id when the Activate button is held and we have a new NavId, which affected browsing some popups ( #787 )  
						
						
						
						
					 
					
						2017-09-28 19:07:52 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ca4db8c905 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 
					
						2017-09-28 17:40:25 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e8f7c83138 
					 
					
						
						
							
							Begin: Shallow tweak to minimize diff with nav branch  
						
						
						
						
					 
					
						2017-09-28 17:37:55 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						926c1cf9a4 
					 
					
						
						
							
							Merged from Navigation branch: ImGuiItemFlags_SelectableDontClosePopup flag  
						
						
						
						
					 
					
						2017-09-28 17:02:28 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f99348711b 
					 
					
						
						
							
							Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.  
						
						
						
						
					 
					
						2017-09-28 16:41:01 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						9142002121 
					 
					
						
						
							
							Separator(): Tweak Logging so that the separator text is aligned according to tree padding.  
						
						
						
						
					 
					
						2017-09-28 16:40:28 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d394c7ad0b 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 
					
						2017-09-28 15:45:35 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0106dcbd02 
					 
					
						
						
							
							Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily.  
						
						
						
						
					 
					
						2017-09-28 15:43:26 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						2a8eb618dc 
					 
					
						
						
							
							Nav: Fixed NavDown to open menu from a menu bar ( #787 )  
						
						
						
						
					 
					
						2017-09-28 00:36:58 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						35f65e05ed 
					 
					
						
						
							
							Merge branch 'master' into navigation  
						
						
						
						
					 
					
						2017-09-28 00:33:29 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						fafe65a8fc 
					 
					
						
						
							
							Refactor to move the responsability of SetHovered() to ItemHoverable() - previously IsHovered(). Simpler and the parallel to ItemAdd is clearer with the new name.  
						
						
						
						
					 
					
						2017-09-28 00:21:47 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						2159629e9e 
					 
					
						
						
							
							Removed another msileading difference between the hovered functions (IsWindowContentHoverable() uses the root window already). Sorry for the commit spam! (making small commit to easily be able to Bisect those in case I make a mistake)  
						
						
						
						
					 
					
						2017-09-28 00:05:35 +02:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						eca74d55c7 
					 
					
						
						
							
							IsItemHovered(), IsHovered(): Shallow tweaks, eventually removed all the braces.  
						
						
						
						
					 
					
						2017-09-28 00:05:18 +02:00