Fixed canvas utility removing itself (#327)

XRTK · Sep 16, 2019 · 3b02262 · 3b02262
1 parent f129dcf
commit 3b02262
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/XRTK-Core/Packages/com.xrtk.core/Inspectors/Utilities/CanvasEditorExtension.cs b/XRTK-Core/Packages/com.xrtk.core/Inspectors/Utilities/CanvasEditorExtension.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using XRTK.Extensions;
 using UnityEditor;
 using UnityEngine;
+using XRTK.Extensions;
 using XRTK.Interfaces.InputSystem;
 using XRTK.Services;
 using XRTK.Utilities;
@@ -24,30 +24,36 @@ public class CanvasEditorExtension : Editor
 
         private bool hasUtility = false;
 
-        private static bool IsUtilityValid
+        private static bool IsUtilityValid =>
+            MixedRealityToolkit.Instance != null &&
+            MixedRealityToolkit.HasActiveProfile &&
+            MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled &&
+            MixedRealityToolkit.GetService<IMixedRealityInputSystem>(false) != null;
+
+        private bool CanUpdateSettings
         {
             get
             {
-                var isInputSystemValid = MixedRealityToolkit.GetService<IMixedRealityInputSystem>(false) != null;
-                return MixedRealityToolkit.Instance != null && 
-                       MixedRealityToolkit.HasActiveProfile && 
-                       MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled && 
-                       isInputSystemValid;
+                if (!MixedRealityToolkit.IsInitialized ||
+                    !MixedRealityPreferences.ShowCanvasUtilityPrompt)
+                {
+                    return false;
+                }
+
+                var utility = canvas.GetComponent<CanvasUtility>();
+
+                hasUtility = utility != null;
+
+                return hasUtility && !IsUtilityValid ||
+                       !hasUtility && IsUtilityValid;
             }
         }
 
         private void OnEnable()
         {
-            if (!MixedRealityToolkit.IsInitialized || !MixedRealityPreferences.ShowCanvasUtilityPrompt) { return; }
-
             canvas = (Canvas)target;
 
-            var utility = canvas.GetComponent<CanvasUtility>();
-
-            hasUtility = utility != null;
-
-            if (hasUtility && !IsUtilityValid ||
-                !hasUtility && IsUtilityValid)
+            if (CanUpdateSettings)
             {
                 UpdateCanvasSettings();
             }
@@ -58,9 +64,7 @@ public override void OnInspectorGUI()
             EditorGUI.BeginChangeCheck();
             base.OnInspectorGUI();
 
-            if (EditorGUI.EndChangeCheck() &&
-                MixedRealityToolkit.IsInitialized &&
-                MixedRealityPreferences.ShowCanvasUtilityPrompt)
+            if (EditorGUI.EndChangeCheck() && CanUpdateSettings)
             {
                 UpdateCanvasSettings();
             }
@@ -110,7 +114,6 @@ private void UpdateCanvasSettings()
             {
                 // Sets it back to MainCamera default.
                 canvas.worldCamera = null;
-                removeUtility = true;
             }
 
             var utility = canvas.GetComponent<CanvasUtility>();

diff --git a/XRTK-Core/Packages/com.xrtk.core/Utilities/CanvasUtility.cs b/XRTK-Core/Packages/com.xrtk.core/Utilities/CanvasUtility.cs
@@ -37,10 +37,11 @@ private void Start()
         {
             Debug.Assert(Canvas != null);
 
-            if (MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled &&
+            if (MixedRealityToolkit.IsInitialized &&
+                MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled &&
                 Canvas.isRootCanvas && Canvas.renderMode == RenderMode.WorldSpace)
             {
-                Canvas.worldCamera = MixedRealityToolkit.InputSystem?.FocusProvider?.UIRaycastCamera;
+                Canvas.worldCamera = MixedRealityToolkit.InputSystem.FocusProvider.UIRaycastCamera;
             }
         }
     }