Merge pull request #3832 from Railboy/mrtk_appbar_touch_fix

Update AppBar to make touch events work in all cases

Author: wiwei

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/AppBar/AppBarButton.cs

@@ -18,7 +18,7 @@ public class AppBarButton : MonoBehaviour
 
         public int DisplayOrder { get { return displayOrder; } }
 
-        public bool Visible { get { return visible; } }
+        public bool Visible { get { return gameObject.activeSelf; } }
 
         [SerializeField]
         private PressableButton button = null;
@@ -34,8 +34,6 @@ public class AppBarButton : MonoBehaviour
         private AppBar.ButtonTypeEnum buttonType = AppBar.ButtonTypeEnum.Custom;
         [SerializeField]
         private int displayOrder;
-        [SerializeField]
-        private bool visible;
 
         private AppBar parentToolBar;
         private Vector3 targetPosition;
@@ -81,26 +79,14 @@ public void InitializeButtonContent(AppBar parentToolBar)
                         primaryLabels[i].text = buttonText;
 
                     seeItSayItLabel.text = "Say \"" + buttonText + "\"";
-
-                    // TODO use property blocks once Interactable no longer uses instanced materials
-                    /*if (iconPropertyBlock == null)
-                        iconPropertyBlock = new MaterialPropertyBlock();
-
-                    if (icon.HasPropertyBlock())
-                    {
-                        icon.GetPropertyBlock(iconPropertyBlock);
-                    }
-                    iconPropertyBlock.SetTexture("_MainTex", buttonIcon);
-                    icon.SetPropertyBlock(iconPropertyBlock);*/
-
                     icon.material.mainTexture = buttonIcon;
                     break;
             }
         }
 
         private void UpdateButton()
         {
-            transform.localPosition = Vector3.Lerp(transform.localPosition, visible ? targetPosition : Vector3.zero, Time.deltaTime * changeSpeed);
+            transform.localPosition = Vector3.Lerp(transform.localPosition, Visible ? targetPosition : Vector3.zero, Time.deltaTime * changeSpeed);
         }
 
         public void SetTargetPosition(Vector3 targetPosition)
@@ -110,11 +96,11 @@ public void SetTargetPosition(Vector3 targetPosition)
 
         public void SetVisible(bool visible)
         {
-            this.visible = visible;
-
+            gameObject.SetActive(visible);
             // Use the interactable theme to make button invisible
             button.enabled = visible;
             interactable.Enabled = visible;
+
         }
     }
 }

Assets/MixedRealityToolkit.Services/InputSystem/NearInteractionTouchable.cs

@@ -94,7 +94,7 @@ private enum TouchableSurface
         public static IReadOnlyCollection<NearInteractionTouchable> Instances { get { return instances.AsReadOnly(); } }
         private static readonly List<NearInteractionTouchable> instances = new List<NearInteractionTouchable>();
 
-        public bool ColliderEnabled { get { return !usesCollider || touchableCollider.enabled; } }
+        public bool ColliderEnabled { get { return !usesCollider || touchableCollider.enabled && touchableCollider.gameObject.activeInHierarchy; } }
 
         /// <summary>
         /// Local space forward direction