Convert usage of OverrideFocusedObject to global listener after merge

Robert El-Soudani · Robert El-Soudani · commit bc3ed7fd0599 · 2017-06-08T16:54:52.000-07:00
diff --git a/Assets/HoloToolkit/SharingWithUNET/Scripts/UNetSharedHologram.cs b/Assets/HoloToolkit/SharingWithUNET/Scripts/UNetSharedHologram.cs
@@ -98,15 +98,15 @@ public void OnInputClicked(InputClickedEventData eventData)
                 Moving = !Moving;
                 if (Moving)
                 {
-                    inputManager.OverrideFocusedObject = this.gameObject;
+                    inputManager.AddGlobalListener(gameObject);
                     if (SpatialMappingManager.Instance != null)
                     {
                         SpatialMappingManager.Instance.DrawVisualMeshes = true;
                     }
                 }
                 else
                 {
-                    inputManager.OverrideFocusedObject = null;
+                    inputManager.RemoveGlobalListener(gameObject);
                     if (SpatialMappingManager.Instance != null)
                     {
                         SpatialMappingManager.Instance.DrawVisualMeshes = false;
@@ -121,6 +121,8 @@ public void OnInputClicked(InputClickedEventData eventData)
                         PlayerController.Instance.SendSharedTransform(this.gameObject, localPosition, localRotation);
                     }
                 }
+
+                eventData.Use();
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -98,15 +98,15 @@ public void OnInputClicked(InputClickedEventData eventData)`
`98`	`98`	`Moving = !Moving;`
`99`	`99`	`if (Moving)`
`100`	`100`	`{`
`101`		`- inputManager.OverrideFocusedObject = this.gameObject;`
	`101`	`+ inputManager.AddGlobalListener(gameObject);`
`102`	`102`	`if (SpatialMappingManager.Instance != null)`
`103`	`103`	`{`
`104`	`104`	`SpatialMappingManager.Instance.DrawVisualMeshes = true;`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`else`
`108`	`108`	`{`
`109`		`- inputManager.OverrideFocusedObject = null;`
	`109`	`+ inputManager.RemoveGlobalListener(gameObject);`
`110`	`110`	`if (SpatialMappingManager.Instance != null)`
`111`	`111`	`{`
`112`	`112`	`SpatialMappingManager.Instance.DrawVisualMeshes = false;`
`@@ -121,6 +121,8 @@ public void OnInputClicked(InputClickedEventData eventData)`
`121`	`121`	`PlayerController.Instance.SendSharedTransform(this.gameObject, localPosition, localRotation);`
`122`	`122`	`}`
`123`	`123`	`}`
	`124`	`+`
	`125`	`+ eventData.Use();`
`124`	`126`	`}`
`125`	`127`	`}`
`126`	`128`	`}`