stash changes

com.unity.uiwidgets/Runtime/rendering/object.cs

 
         bool _needsCompositing;
 
-        public bool needsCompositing {
+        public virtual bool needsCompositing {
             get {
                 D.assert(!_needsCompositingBitsUpdate);
                 return _needsCompositing;

com.unity.uiwidgets/Runtime/rendering/proxy_box.cs

 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.ui;
+using UnityEngine;
+using Color = Unity.UIWidgets.ui.Color;
+using Rect = Unity.UIWidgets.ui.Rect;
+using Shader = Unity.UIWidgets.ui.Shader;
 using TextStyle = Unity.UIWidgets.painting.TextStyle;
 
 namespace Unity.UIWidgets.rendering {
 
         public bool _annotationIsActive;
 
-        public bool needsCompositing {
+        public override bool needsCompositing {
+
+        ImageFilter _filter;
-            if (_annotationIsActive) {
-                AnnotatedRegionLayer<MouseTrackerAnnotation> layer = new AnnotatedRegionLayer<MouseTrackerAnnotation>(
-                    _hoverAnnotation,
-                    size: size,
-                    offset: offset,
-                    opaque: opaque // TODO
-                );
-                context.pushLayer(layer, base.paint, offset);
+            if (child != null) {
+                if (_annotationIsActive) {
+                    Debug.Log("paint 1 >>>>>");
+                    layer = layer ?? new AnnotatedRegionLayer<MouseTrackerAnnotation>(
+                        _hoverAnnotation,
+                        size: size,
+                        offset: offset,
+                        opaque: opaque // TODO
+                    );
+                    context.pushLayer(layer, base.paint, offset);
+                }
+                else {
+                    Debug.Log("paint 2 >>>>>");
+                    base.paint(context, offset);
+                }
-                base.paint(context, offset);
+                layer = null;
             }
         }
 

com.unity.uiwidgets/Runtime/widgets/basic.cs

             properties.add(new FloatProperty("aspectRatio", aspectRatio));
         }
     }
-
+/*
     public class MouseRegion : StatefulWidget {
         public MouseRegion(
             Key key = null,
             bool opaque = true,
             Widget child = null
         ) : base(key: key) {
-            D.assert(opaque != null);
             this.onEnter = onEnter;
             this.onExit = onExit;
             this.onHover = onHover;
         public override Widget build(BuildContext context) {
             return new _RawMouseRegion(this);
         }
-    }
+    }*/
-    public class _RawMouseRegion : SingleChildRenderObjectWidget {
-        public _RawMouseRegion(_MouseRegionState owner) : base(child: owner.widget.child) {
-            this.owner = owner;
+    public class MouseRegion : SingleChildRenderObjectWidget {
+        public MouseRegion(
+            Key key = null,
+            PointerEnterEventListener onEnter = null,
+            PointerExitEventListener onExit = null,
+            PointerHoverEventListener onHover = null,
+            bool opaque = true,
+            Widget child = null
+            ) : base(key: key, child: child) {
+            this.onEnter = onEnter;
+            this.onExit = onExit;
+            this.onHover = onHover;
+            this.opaque = opaque;
-        public readonly _MouseRegionState owner;
+        public readonly PointerEnterEventListener onEnter;
+        public readonly PointerHoverEventListener onHover;
+        public readonly PointerExitEventListener onExit;
+        public readonly bool opaque;
+        
+        void handleExit(PointerExitEvent _event) {
+            if (onExit != null) {
+                onExit(_event);
+            }
+        }
+
+        public PointerExitEventListener getHandleExit() {
+            return onExit == null ? (PointerExitEventListener) null : handleExit;
+        }
-            MouseRegion widget = owner.widget;
-                onEnter: widget.onEnter,
-                onHover: widget.onHover,
-                onExit: owner.getHandleExit(),
-                opaque: widget.opaque
+                onEnter: onEnter,
+                onHover: onHover,
+                onExit: getHandleExit(),
+                opaque: opaque
-            MouseRegion widget = owner.widget;
-            _renderObject.onEnter = widget.onEnter;
-            _renderObject.onHover = widget.onHover;
-            _renderObject.onExit = owner.getHandleExit();
-            _renderObject.opaque = widget.opaque;
+            _renderObject.onEnter = onEnter;
+            _renderObject.onHover = onHover;
+            _renderObject.onExit = getHandleExit();
+            _renderObject.opaque = opaque;
         }
     }