Merge pull request #9648 from mr-watts/mrwatts/bugfix-interactable-focus-reset

keveleigh · web-flow · commit 2b08fe6b5e03 · 2021-04-15T10:15:33.000-07:00
Fix: focus getting stuck on `Interactable` when `RequiresFocus` is `false`.
diff --git a/Assets/MRTK/SDK/Features/UX/Interactable/Scripts/Interactable.cs b/Assets/MRTK/SDK/Features/UX/Interactable/Scripts/Interactable.cs
@@ -1302,7 +1302,7 @@ protected IEnumerator GlobalVisualReset(float time)
             yield return new WaitForSeconds(time);
 
             HasVoiceCommand = false;
-            if (!HasFocus)
+            if (HasFocus && focusingPointers.Count == 0)
             {
                 HasFocus = false;
             }

Original file line number	Diff line number	Diff line change
`@@ -1302,7 +1302,7 @@ protected IEnumerator GlobalVisualReset(float time)`
`1302`	`1302`	`yield return new WaitForSeconds(time);`
`1303`	`1303`
`1304`	`1304`	`HasVoiceCommand = false;`
`1305`		`- if (!HasFocus)`
	`1305`	`+ if (HasFocus && focusingPointers.Count == 0)`
`1306`	`1306`	`{`
`1307`	`1307`	`HasFocus = false;`
`1308`	`1308`	`}`