Remember Focus State before triggering button on Voice Command. Reset state after triggering.

Wouter Spaas · Wouter Spaas · commit 1a9fb98dd648 · 2021-04-12T12:23:04.000+02:00
diff --git a/Assets/MRTK/SDK/Features/UX/Interactable/Scripts/Interactable.cs b/Assets/MRTK/SDK/Features/UX/Interactable/Scripts/Interactable.cs
@@ -1513,11 +1513,13 @@ public void OnSpeechKeywordRecognized(SpeechEventData eventData)
 
             if (eventData.Command.Keyword == VoiceCommand && (!VoiceRequiresFocus || HasFocus) && CanInteract())
             {
+                bool hadFocus = HasFocus;
                 StartGlobalVisual(true);
                 HasVoiceCommand = true;
                 SendVoiceCommands(VoiceCommand, 0, 1);
                 TriggerOnClick();
                 eventData.Use();
+                HasFocus = hadFocus;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1513,11 +1513,13 @@ public void OnSpeechKeywordRecognized(SpeechEventData eventData)`
`1513`	`1513`
`1514`	`1514`	`if (eventData.Command.Keyword == VoiceCommand && (!VoiceRequiresFocus \|\| HasFocus) && CanInteract())`
`1515`	`1515`	`{`
	`1516`	`+ bool hadFocus = HasFocus;`
`1516`	`1517`	`StartGlobalVisual(true);`
`1517`	`1518`	`HasVoiceCommand = true;`
`1518`	`1519`	`SendVoiceCommands(VoiceCommand, 0, 1);`
`1519`	`1520`	`TriggerOnClick();`
`1520`	`1521`	`eventData.Use();`
	`1522`	`+ HasFocus = hadFocus;`
`1521`	`1523`	`}`
`1522`	`1524`	`}`
`1523`	`1525`