Merge pull request #139 from UnityTech/textselection

Textselection

Author: kgdev

Runtime/gestures/hover.cs

@@ -0,0 +1,26 @@
+using Unity.UIWidgets.foundation;
+
+namespace Unity.UIWidgets.gestures {
+    
+    public delegate void PointerHoverEnterCallback(PointerHoverEvent evt);
+
+    public delegate void PointerHoverLeaveCallback();
+    
+    public class HoverRecognizer : DiagnosticableTree {
+        public HoverRecognizer(object debugOwner = null) {
+            this.debugOwner = debugOwner;
+        }
+
+        readonly object debugOwner;
+
+        public PointerHoverEnterCallback OnPointerEnter;
+
+        public PointerHoverLeaveCallback OnPointerLeave;
+        
+        public override void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+            base.debugFillProperties(properties);
+            properties.add(new DiagnosticsProperty<object>("debugOwner", this.debugOwner,
+                defaultValue: Diagnostics.kNullDefaultValue));
+        }
+    }
+}

Runtime/gestures/hover.cs.meta

@@ -5,6 +5,7 @@ namespace Unity.UIWidgets.painting {
     public enum RenderComparison {
         identical,
         metadata,
+        function,
         paint,
         layout,
     }

Runtime/painting/basic_types.cs

@@ -15,13 +15,15 @@ public class TextSpan : DiagnosticableTree, IEquatable<TextSpan> {
         public readonly string text;
         public readonly List<TextSpan> children;
         public readonly GestureRecognizer recognizer;
+        public readonly HoverRecognizer hoverRecognizer;
 
         public TextSpan(string text = "", TextStyle style = null, List<TextSpan> children = null,
-            GestureRecognizer recognizer = null) {
+            GestureRecognizer recognizer = null, HoverRecognizer hoverRecognizer = null) {
             this.text = text;
             this.style = style;
             this.children = children;
             this.recognizer = recognizer;
+            this.hoverRecognizer = hoverRecognizer;
         }
 
         public void build(ParagraphBuilder builder, float textScaleFactor = 1.0f) {
@@ -46,6 +48,20 @@ public void build(ParagraphBuilder builder, float textScaleFactor = 1.0f) {
             }
         }
 
+        public bool hasHoverRecognizer {
+            get {
+                bool need = false;
+                this.visitTextSpan((text) => {
+                    if (text.hoverRecognizer != null) {
+                        need = true;
+                        return false;
+                    }
+                    return true;
+                });
+                return need;
+            }
+        }
+
         bool visitTextSpan(Visitor visitor) {
             if (!string.IsNullOrEmpty(this.text)) {
                 if (!visitor.Invoke(this)) {
@@ -153,6 +169,11 @@ public RenderComparison compareTo(TextSpan other) {
             RenderComparison result = Equals(this.recognizer, other.recognizer)
                 ? RenderComparison.identical
                 : RenderComparison.metadata;
+
+            if (!Equals(this.hoverRecognizer, other.hoverRecognizer)) {
+                result = RenderComparison.function > result ? RenderComparison.function : result;
+            }
+            
             if (this.style != null) {
                 var candidate = this.style.compareTo(other.style);
                 if (candidate > result) {

Runtime/painting/text_span.cs

@@ -59,6 +59,8 @@ public RenderParagraph(TextSpan text,
             this._selection = null;
             this.onSelectionChanged = onSelectionChanged;
             this.selectionColor = selectionColor;
+
+            this._resetHoverHandler();
         }
 
         public Action onSelectionChanged;
@@ -86,6 +88,9 @@ public TextSpan text {
                     case RenderComparison.identical:
                     case RenderComparison.metadata:
                         return;
+                    case RenderComparison.function:
+                        this._textPainter.text = value;
+                        break;
                     case RenderComparison.paint:
                         this._textPainter.text = value;
                         this.markNeedsPaint();
@@ -95,6 +100,8 @@ public TextSpan text {
                         this.markNeedsLayout();
                         break;
                 }
+
+                this._resetHoverHandler();
             }
         }
 
@@ -241,6 +248,16 @@ public bool hasFocus {
             }
         }
 
+        TextSpan _previousHoverSpan;
+        bool _pointerHoverInside;
+        bool _hasHoverRecognizer;
+
+        void _resetHoverHandler() {
+            this._hasHoverRecognizer = this._textPainter.text.hasHoverRecognizer;
+            this._previousHoverSpan = null;
+            this._pointerHoverInside = false;
+        }
+
         void _handleKeyEvent(RawKeyEvent keyEvent) {
             //only allow KCommand.copy
             if (keyEvent is RawKeyUpEvent) {
@@ -316,17 +333,46 @@ void _handleSelectionChanged(TextSelection selection,
             this.onSelectionChanged?.Invoke();
         }
 
+
+        void _handlePointerHover(PointerEvent evt) {
+            if (!this._hasHoverRecognizer) {
+                return;
+            }
+
+            if (evt is PointerEnterEvent) {
+                this._pointerHoverInside = true;
+            }
+            else if (evt is PointerLeaveEvent) {
+                this._pointerHoverInside = false;
+                this._previousHoverSpan?.hoverRecognizer?.OnPointerLeave?.Invoke();
+                this._previousHoverSpan = null;
+            }
+            else if (evt is PointerHoverEvent && this._pointerHoverInside) {
+                this._layoutTextWithConstraints(this.constraints);
+                Offset offset = this.globalToLocal(evt.position);
+                TextPosition position = this._textPainter.getPositionForOffset(offset);
+                TextSpan span = this._textPainter.text.getSpanForPosition(position);
+
+                if (this._previousHoverSpan != span) {
+                    this._previousHoverSpan?.hoverRecognizer?.OnPointerLeave?.Invoke();
+                    span?.hoverRecognizer?.OnPointerEnter?.Invoke((PointerHoverEvent) evt);
+                    this._previousHoverSpan = span;
+                }
+            }
+        }
+
         public override void handleEvent(PointerEvent evt, HitTestEntry entry) {
             D.assert(this.debugHandleEvent(evt, entry));
-            if (!(evt is PointerDownEvent)) {
+            if (evt is PointerDownEvent) {
+                this._layoutTextWithConstraints(this.constraints);
+                Offset offset = ((BoxHitTestEntry) entry).localPosition;
+                TextPosition position = this._textPainter.getPositionForOffset(offset);
+                TextSpan span = this._textPainter.text.getSpanForPosition(position);
+                span?.recognizer?.addPointer((PointerDownEvent) evt);
                 return;
             }
 
-            this._layoutTextWithConstraints(this.constraints);
-            Offset offset = ((BoxHitTestEntry) entry).localPosition;
-            TextPosition position = this._textPainter.getPositionForOffset(offset);
-            TextSpan span = this._textPainter.text.getSpanForPosition(position);
-            span?.recognizer?.addPointer((PointerDownEvent) evt);
+            this._handlePointerHover(evt);
         }
 
         protected override void performLayout() {
@@ -375,6 +421,7 @@ void _paintSelection(Canvas canvas, Offset effectiveOffset) {
             foreach (var box in this._selectionRects) {
                 barPath.addRect(box.toRect().shift(effectiveOffset));
             }
+
             canvas.drawPath(barPath, paint);
         }
 

Runtime/rendering/paragraph.cs

@@ -0,0 +1,82 @@
+using System.Collections.Generic;
+using Unity.UIWidgets.gestures;
+using Unity.UIWidgets.material;
+using Unity.UIWidgets.painting;
+using Unity.UIWidgets.rendering;
+using Unity.UIWidgets.ui;
+using Unity.UIWidgets.widgets;
+using UnityEngine;
+
+namespace UIWidgetsSample {
+    public class HoverRecognizerSample : UIWidgetsSamplePanel {
+        protected override Widget createWidget() {
+            return new MaterialApp(
+                showPerformanceOverlay: false,
+                home: new HoverMainPanel()
+                );
+        }
+
+        protected override void OnEnable() {
+            FontManager.instance.addFont(Resources.Load<Font>(path: "MaterialIcons-Regular"), "Material Icons");
+            base.OnEnable();
+        }
+    }
+
+    class HoverMainPanel : StatefulWidget {
+        public override State createState() {
+            return new HoverMainPanelState();
+        }
+    }
+
+    class HoverMainPanelState : State<HoverMainPanel> {
+        bool hoverActivated = false;
+        
+        public override Widget build(BuildContext context) {
+            return new Scaffold(
+                appBar: new AppBar(
+                    title: new Center(
+                        child: new Text("Test Hover Widget")
+                    )
+                ),
+                body: new Card(
+                    color: Colors.white,
+                    child: new Center(
+                        child: new Column(
+                            mainAxisSize: MainAxisSize.min,
+                            crossAxisAlignment: CrossAxisAlignment.center,
+                            children: new List<Widget> {
+                                new Icon(this.hoverActivated ? Unity.UIWidgets.material.Icons.pool : Unity.UIWidgets.material.Icons.directions_walk, size: 128.0f),
+                                new RichText(
+                                    text: new TextSpan(
+                                        text: "Test <",
+                                        style: new TextStyle(color: Colors.black),
+                                        children: new List<TextSpan>() {
+                                            new TextSpan(
+                                                text: "Hover Me",
+                                                style: new TextStyle(
+                                                    color: Colors.green,
+                                                    decoration: TextDecoration.underline
+                                                ),
+                                                hoverRecognizer: new HoverRecognizer {
+                                                    OnPointerEnter = evt => {
+                                                        this.setState(() => { this.hoverActivated = true; });
+                                                    },
+                                                    OnPointerLeave = () => {
+                                                        this.setState(() => { this.hoverActivated = false;});
+                                                    }
+                                                }
+                                            ),
+                                            new TextSpan(
+                                                text: ">"
+                                            )
+                                        }
+                                    )
+                                )
+                            }
+                        )
+                    )
+                )
+            );
+        }
+    }
+}

Samples/UIWidgetSample/HoverRecognizerSample.cs

@@ -56,7 +56,7 @@ public override Widget build(BuildContext context) {
                                 color: Colors.green,
                                 decoration: TextDecoration.underline
                             )
-                          //  recognizer: this._longPressRecognizer
+                            //recognizer: this._longPressRecognizer
                         ),
                         new TextSpan(
                             text: " secret?"