Fixed an issue with UI recognition breaking when StandardLayer is disabled (#259).

valyard · valyard · commit 55114e470b4a · 2017-09-06T22:21:19.000+03:00
diff --git a/Source/Assets/TouchScript/Scripts/Layers/StandardLayer.cs b/Source/Assets/TouchScript/Scripts/Layers/StandardLayer.cs
@@ -265,7 +265,11 @@ private IEnumerator lateEnable()
         private void OnDisable()
         {
             if (!Application.isPlaying) return;
-            if (inputModule != null) inputModule.INTERNAL_Release();
+            if (inputModule != null) 
+            {
+                inputModule.INTERNAL_Release();
+                inputModule = null;
+            }
             if (TouchManager.Instance != null) TouchManager.Instance.FrameStarted -= frameStartedHandler;
         }
 
diff --git a/Source/Assets/TouchScript/Scripts/Layers/UI/TouchScriptInputModule.cs b/Source/Assets/TouchScript/Scripts/Layers/UI/TouchScriptInputModule.cs
@@ -492,14 +492,17 @@ public virtual void ProcessUpdated(object sender, PointerEventArgs pointerEventA
 						var press = pointer.GetPressData();
 						if (press.Type != HitData.HitType.UI) continue;
 					}
-                    else
-                    {
-    					// Don't update the pointer if it is not over an UI element
-                        if (over.Type != HitData.HitType.UI) continue;
-                    }
 
                     PointerEventData data;
                     GetPointerData(pointer.Id, out data, true);
+
+                    // If not over an UI element this and previous frame, don't process further.
+                    // Need to check the previous hover state to properly process leaving a UI element.
+                    if (over.Type != HitData.HitType.UI) 
+                    {
+                        if (data.hovered.Count == 0) continue;
+                    }
+
                     data.Reset();
                     var target = over.Target;
                     var currentOverGo = target == null ? null : target.gameObject;

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,11 @@ private IEnumerator lateEnable()`
`265`	`265`	`private void OnDisable()`
`266`	`266`	`{`
`267`	`267`	`if (!Application.isPlaying) return;`
`268`		`- if (inputModule != null) inputModule.INTERNAL_Release();`
	`268`	`+ if (inputModule != null)`
	`269`	`+ {`
	`270`	`+ inputModule.INTERNAL_Release();`
	`271`	`+ inputModule = null;`
	`272`	`+ }`
`269`	`273`	`if (TouchManager.Instance != null) TouchManager.Instance.FrameStarted -= frameStartedHandler;`
`270`	`274`	`}`
`271`	`275`