Fix issue where tools menu didn't return to its initial state when hiding the radial menu

mtschoen-unity · mtschoen-unity · commit 9e0fa057b147 · 2017-12-08T02:29:37.000-08:00
diff --git a/Scripts/Core/EditorVR.Menus.cs b/Scripts/Core/EditorVR.Menus.cs
@@ -177,8 +177,7 @@ static void UpdateAlternateMenuForDevice(DeviceData deviceData)
                 alternateMenu.menuHideFlags = deviceData.currentTool is IExclusiveMode ? 0 : deviceData.menuHideData[alternateMenu].hideFlags;
 
                 // Move the Tools Menu buttons to an alternate position if the radial menu will be shown
-                if (alternateMenu is RadialMenu)
-                    deviceData.toolsMenu.alternateMenuVisible = alternateMenu.menuHideFlags == 0;
+                deviceData.toolsMenu.alternateMenuVisible = alternateMenu.menuHideFlags == 0 && alternateMenu is RadialMenu;
             }
 
             static Transform GetCustomMenuOrigin(Transform rayOrigin)

Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,7 @@ static void UpdateAlternateMenuForDevice(DeviceData deviceData)`
`177`	`177`	`alternateMenu.menuHideFlags = deviceData.currentTool is IExclusiveMode ? 0 : deviceData.menuHideData[alternateMenu].hideFlags;`
`178`	`178`
`179`	`179`	`// Move the Tools Menu buttons to an alternate position if the radial menu will be shown`
`180`		`- if (alternateMenu is RadialMenu)`
`181`		`- deviceData.toolsMenu.alternateMenuVisible = alternateMenu.menuHideFlags == 0;`
	`180`	`+ deviceData.toolsMenu.alternateMenuVisible = alternateMenu.menuHideFlags == 0 && alternateMenu is RadialMenu;`
`182`	`181`	`}`
`183`	`182`
`184`	`183`	`static Transform GetCustomMenuOrigin(Transform rayOrigin)`