Dispatch drag start event in StartDrag

xiaoguzhu · xiaoguzhu · commit ccf1db8b96e3 · 2020-07-29T17:33:18.000+08:00
diff --git a/Assets/Scripts/UI/GObject.cs b/Assets/Scripts/UI/GObject.cs
@@ -2016,6 +2016,9 @@ private void InitDrag()
 
         private void DragBegin(int touchId)
         {
+            if (DispatchEvent("onDragStart", touchId))
+                return;
+
             if (draggingObject != null)
             {
                 GObject tmp = draggingObject;
@@ -2074,8 +2077,7 @@ private void __touchMove(EventContext context)
                     return;
 
                 _dragTesting = false;
-                if (!DispatchEvent("onDragStart", evt.touchId))
-                    DragBegin(evt.touchId);
+                DragBegin(evt.touchId);
             }
 
             if (draggingObject == this)

Original file line number	Diff line number	Diff line change
`@@ -2016,6 +2016,9 @@ private void InitDrag()`
`2016`	`2016`
`2017`	`2017`	`private void DragBegin(int touchId)`
`2018`	`2018`	`{`
	`2019`	`+ if (DispatchEvent("onDragStart", touchId))`
	`2020`	`+ return;`
	`2021`	`+`
`2019`	`2022`	`if (draggingObject != null)`
`2020`	`2023`	`{`
`2021`	`2024`	`GObject tmp = draggingObject;`
`@@ -2074,8 +2077,7 @@ private void __touchMove(EventContext context)`
`2074`	`2077`	`return;`
`2075`	`2078`
`2076`	`2079`	`_dragTesting = false;`
`2077`		`- if (!DispatchEvent("onDragStart", evt.touchId))`
`2078`		`- DragBegin(evt.touchId);`
	`2080`	`+ DragBegin(evt.touchId);`
`2079`	`2081`	`}`
`2080`	`2082`
`2081`	`2083`	`if (draggingObject == this)`