Merge pull request #187 from Unity-Technologies/handle_touches_on_mobile

Handle touches on mobile

Author: SiyaoHuang

Samples/UIWidgetsSamples_2019_4/Assets/WidgetsSample/MobileTouchSample.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using uiwidgets;
+using Unity.UIWidgets.engine;
+using Unity.UIWidgets.foundation;
+using Unity.UIWidgets.material;
+using Unity.UIWidgets.rendering;
+using Unity.UIWidgets.ui;
+using Unity.UIWidgets.widgets;
+using UnityEngine;
+using UnityEngine.Networking;
+using Image = Unity.UIWidgets.widgets.Image;
+using ui_ = Unity.UIWidgets.widgets.ui_;
+
+namespace UIWidgetsSample
+{
+    public class MobileTouchSample : UIWidgetsPanel
+    {
+        protected override void main()
+        {
+            ui_.runApp(new MaterialApp(
+                title: "Http Request Sample",
+                home: new Scaffold(
+                    body: new MobileTouchWidget()
+                )
+            ));
+        }
+    }
+
+    public class MobileTouchWidget : StatefulWidget
+    {
+        public MobileTouchWidget(Key key = null) : base(key)
+        {
+        }
+
+        public override State createState()
+        {
+            return new MobileTouchWidgetState();
+        }
+    }
+
+    class MobileTouchWidgetState : State<MobileTouchWidget>
+    {
+        private float scale = 1;
+        private int frameNo = 0;
+        private float rotation = 0;
+
+        public override Widget build(BuildContext context)
+        {
+            return new Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: new List<Widget>()
+                {
+                    new Text("Frame: " + frameNo),
+                    new Text("Scale: " + scale),
+                    new Text("Rotation: " + rotation),
+                    new GestureDetector(
+                        child: new Container(height: 300, color: Colors.blue),
+                        onScaleStart: details => { },
+                        onScaleUpdate: details =>
+                        {
+                            scale = details.scale;
+                            rotation = details.rotation;
+                            frameNo += 1;
+                            setState(() => { });
+                        },
+                        onScaleEnd: details => { }
+                    )
+                });
+        }
+    }
+}

com.unity.uiwidgets/Runtime/Plugins/Android/libUIWidgets.so

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1da51fd7da36b323f17882f7ddaabbb5a08c09ce5e649821a1f242927da4974f
-size 76055048
+oid sha256:39792c1a15937910cf2938e3e9937422e3520dab4a14b09f3e8fbf91a233db52
+size 76747900

com.unity.uiwidgets/Runtime/Plugins/ios/libUIWidgets.a

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee599723799bd2fd383fd8e36407ab66072cf01d6df48a349efe8ee9e6300b25
-size 247466888
+oid sha256:845d1eb0cab9827127f8758e5393fbc12191fae907edffab8a2d29db5425c945
+size 247828112

com.unity.uiwidgets/Runtime/Plugins/osx/libUIWidgets.dylib

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16d2be3e47cfadfd0bbb33aabe4edc5a18e04dd122172b5f9fa855d04e8158ee
-size 21817320
+oid sha256:45bc8d2b586ede8e9dae7ce5f660b4cbadf0994d0d7b4d28e7c2fd6211d116fa
+size 21819832

com.unity.uiwidgets/Runtime/Plugins/x86_64/libUIWidgets.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8db63b6dfb62799c6decd05c92136208ae0dcce6eb3d545bbda1e19594e9ba75
-size 11256320
+oid sha256:49701553366d65e4ed4f03b9d8534c47f4bc9bd5b847dffbe3c11e19033d9264
+size 11258880

com.unity.uiwidgets/Runtime/Plugins/x86_64/libUIWidgets.dll.meta

@@ -289,8 +289,8 @@ public void OnMouseMove(Vector2? pos) {
             if (pos == null) {
                 return;
             }
-
-            UIWidgetsPanel_onMouseMove(ptr: _ptr, x: pos.Value.x, y: pos.Value.y);
+            
+            UIWidgetsPanel_onMouseMove(ptr: _ptr, x: pos.Value.x, y: pos.Value.y, -1);
         }
 
         public void OnMouseScroll(Vector2 delta, Vector2? pos) {
@@ -330,7 +330,7 @@ public void OnDrag(Vector2? pos, int pointerId) {
 
             // mouse event
             if (pointerId < 0) {
-                UIWidgetsPanel_onMouseMove(ptr: _ptr, x: pos.Value.x, y: pos.Value.y);
+                UIWidgetsPanel_onMouseMove(ptr: _ptr, x: pos.Value.x, y: pos.Value.y, pointerId);
             }
         }
 
@@ -360,7 +360,7 @@ public void OnKeyDown(Event e) {
         static extern void UIWidgetsPanel_onMouseUp(IntPtr ptr, float x, float y, int button);
 
         [DllImport(dllName: NativeBindings.dllName)]
-        static extern void UIWidgetsPanel_onMouseMove(IntPtr ptr, float x, float y);
+        static extern void UIWidgetsPanel_onMouseMove(IntPtr ptr, float x, float y, int button);
 
         [DllImport(dllName: NativeBindings.dllName)]
         static extern void UIWidgetsPanel_onMouseLeave(IntPtr ptr);

com.unity.uiwidgets/Runtime/engine/UIWidgetsPanelWrapper.cs

@@ -127,7 +127,7 @@ def set_env_verb():
     global flutter_root_path
     flutter_root_path = os.getenv('FLUTTER_ROOT_PATH', 'null')
     if flutter_root_path == 'null':
-        os.environ["FLUTTER_ROOT_PATH"] = engine_path + "/engine/src"
+        os.environ["FLUTTER_ROOT_PATH"] = os.path.join(engine_path, "engine","src")
         flutter_root_path = os.getenv('FLUTTER_ROOT_PATH')
     else:
         print("This environment variable has been set, skip")