Merge pull request #3719 from keveleigh/input-system-focus-bug

David Kline · web-flow · commit 35c0b2cbd743 · 2019-03-28T09:02:59.000-07:00
Fix focus bug in MixedRealityInputSystem.cs
diff --git a/Assets/MixedRealityToolkit.Services/InputSystem/MixedRealityInputSystem.cs b/Assets/MixedRealityToolkit.Services/InputSystem/MixedRealityInputSystem.cs
@@ -557,10 +557,11 @@ public void RaiseSourceLost(IMixedRealityInputSource source, IMixedRealityContro
                 DetectedControllers.Remove(controller);
             }
 
-            FocusProvider?.OnSourceLost(sourceStateEventData);
-
             // Pass handler through HandleEvent to perform modal/fallback logic
+            // Events have to be handled before FocusProvider.OnSourceLost since they won't be passed on without a focused object
             HandleEvent(sourceStateEventData, OnSourceLostEventHandler);
+
+            FocusProvider?.OnSourceLost(sourceStateEventData);
         }
 
         private static readonly ExecuteEvents.EventFunction<IMixedRealitySourceStateHandler> OnSourceLostEventHandler =

Original file line number	Diff line number	Diff line change
`@@ -557,10 +557,11 @@ public void RaiseSourceLost(IMixedRealityInputSource source, IMixedRealityContro`
`557`	`557`	`DetectedControllers.Remove(controller);`
`558`	`558`	`}`
`559`	`559`
`560`		`- FocusProvider?.OnSourceLost(sourceStateEventData);`
`561`		`-`
`562`	`560`	`// Pass handler through HandleEvent to perform modal/fallback logic`
	`561`	`+ // Events have to be handled before FocusProvider.OnSourceLost since they won't be passed on without a focused object`
`563`	`562`	`HandleEvent(sourceStateEventData, OnSourceLostEventHandler);`
	`563`	`+`
	`564`	`+ FocusProvider?.OnSourceLost(sourceStateEventData);`
`564`	`565`	`}`
`565`	`566`
`566`	`567`	`private static readonly ExecuteEvents.EventFunction<IMixedRealitySourceStateHandler> OnSourceLostEventHandler =`