pointer hover bug fix

Author: zhuxingwei

Runtime/gestures/binding.cs

@@ -60,10 +60,6 @@ void _handlePointerEvent(PointerEvent evt) {
                 return;
             }
 
-            if (evt is PointerHoverEvent) {
-                this._handlePointerHoverEvent(evt);
-            }
-
             HitTestResult hitTestResult = null;
             if (evt is PointerDownEvent) {
                 D.assert(!this._hitTests.ContainsKey(evt.pointer));

Runtime/gestures/events.cs

@@ -148,7 +148,7 @@ public PointerExitEvent(
                 down: false) {
         }
 
-        public static PointerExitEvent fromHoverEvent(PointerHoverEvent hover) {
+        public static PointerExitEvent fromHoverEvent(PointerEvent hover) {
             return new PointerExitEvent(
                 timeStamp: hover.timeStamp,
                 pointer: hover.pointer,

Runtime/gestures/mouse_tracking.cs

@@ -133,7 +133,8 @@ public void collectMousePositions() {
             void exitAnnotation(_TrackedAnnotation trackedAnnotation, int deviceId) {
                 if (trackedAnnotation.annotation?.onExit != null &&
                     trackedAnnotation.activeDevices.Contains(deviceId)) {
-                    trackedAnnotation.annotation.onExit(PointerExitEvent.fromHoverEvent((PointerHoverEvent)this._lastMouseEvent[deviceId]));
+                    trackedAnnotation.annotation.onExit(PointerExitEvent.fromHoverEvent(this._lastMouseEvent[deviceId]));
+                    trackedAnnotation.activeDevices.Remove(deviceId);
                 }
             }
 

Runtime/rendering/binding.cs

@@ -72,7 +72,7 @@ void _handlePersistentFrameCallback(TimeSpan timeStamp) {
         MouseTracker _createMouseTracker() {
             return new MouseTracker(this.pointerRouter, (Offset offset) => {
                 return this.renderView.layer.find<MouseTrackerAnnotation>(
-                        offset * Window.instance.devicePixelRatio
+                        offset
                     );
             });
         }

Tests/Editor/MouseHover.cs

@@ -2,8 +2,9 @@
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.rendering;
-using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
+using UnityEngine;
+using Color = Unity.UIWidgets.ui.Color;
 
 namespace UIWidgets.Tests {
     public class MouseHoverWidget : StatefulWidget {
@@ -20,14 +21,14 @@ public static Widget createRow(bool canHover = true, bool nest = false) {
             Widget result = new Container(width: 200, height: 60, color: Color.fromARGB(255, 255, 0, 255));
             if (canHover) {
                 result = new HoverTrackWidget(null,
-                    result);
+                    result, "inner");
             }
 
             if (nest) {
                 result = new Container(child: result, padding: EdgeInsets.all(40),
                     color: Color.fromARGB(255, 255, 0, 0));
                 result = new HoverTrackWidget(null,
-                    result);
+                    result, "outer");
             }
 
             return result;
@@ -50,9 +51,11 @@ public override Widget build(BuildContext context) {
 
     public class HoverTrackWidget : StatefulWidget {
         public readonly Widget child;
+        public readonly string name;
 
-        public HoverTrackWidget(Key key, Widget child) : base(key) {
+        public HoverTrackWidget(Key key, Widget child, string name) : base(key) {
             this.child = child;
+            this.name = name;
         }
 
         public override State createState() {
@@ -73,11 +76,13 @@ public override Widget build(BuildContext context) {
                 ),
                 onPointerEnter: (evt) => {
                     if (this.mounted) {
+                        Debug.Log(this.widget.name + " pointer enter");
                         this.setState(() => { this.hover = true; });
                     }
                 },
                 onPointerExit: (evt) => {
                     if (this.mounted) {
+                        Debug.Log(this.widget.name + " pointer exit");
                         this.setState(() => { this.hover = false; });
                     }
                 }