@@ -98,11 +98,10 @@ public override void Reset(bool didConnect = false)
9898
9999 graphView = null ;
100100 }
101-
102- public override bool HandleMouseDown ( MouseDownEvent evt )
101+ public override bool HandleMouseDown ( MouseDownEvent evt ) => HandleMouseDownEvent ( evt . mousePosition ) ;
102+
103+ bool HandleMouseDownEvent ( Vector2 mousePosition )
103104 {
104- Vector2 mousePosition = evt . mousePosition ;
105-
106105 if ( ( draggedPort == null ) || ( edgeCandidate == null ) )
107106 {
108107 return false ;
@@ -195,19 +194,20 @@ internal Vector2 GetEffectivePanSpeed(Vector2 mousePos)
195194 }
196195
197196 Vector2 lastMousePos ;
198- public override void HandleMouseMove ( MouseMoveEvent evt )
197+
198+ public override void HandleMouseMove ( MouseMoveEvent evt ) =>
199+ HandleMouseMoveEvent ( ( VisualElement ) evt . target , evt . mousePosition , evt . localMousePosition ) ;
200+ void HandleMouseMoveEvent ( VisualElement ve , Vector2 mousePosition , Vector2 localMousePosition )
199201 {
200- var ve = ( VisualElement ) evt . target ;
201- Vector2 gvMousePos = ve . ChangeCoordinatesTo ( graphView . contentContainer , evt . localMousePosition ) ;
202+ Vector2 gvMousePos = ve . ChangeCoordinatesTo ( graphView . contentContainer , localMousePosition ) ;
202203 panDiff = GetEffectivePanSpeed ( gvMousePos ) ;
203204
204205 if ( panDiff != Vector3 . zero )
205206 panSchedule . Resume ( ) ;
206207 else
207208 panSchedule . Pause ( ) ;
208209
209- Vector2 mousePosition = evt . mousePosition ;
210- lastMousePos = evt . mousePosition ;
210+ lastMousePos = mousePosition ;
211211
212212 edgeCandidate . candidatePosition = mousePosition ;
213213
@@ -277,12 +277,12 @@ private void Pan(TimerState ts)
277277 wasPanned = true ;
278278 }
279279
280- public override void HandleMouseUp ( MouseUpEvent evt )
280+ public override void HandleMouseUp ( MouseUpEvent evt ) => HandleMouseUpEvent ( evt . mousePosition ) ;
281+
282+ void HandleMouseUpEvent ( Vector2 mousePosition )
281283 {
282284 bool didConnect = false ;
283285
284- Vector2 mousePosition = evt . mousePosition ;
285-
286286 // Reset the highlights.
287287 graphView . ports . ForEach ( ( p ) => {
288288 p . OnStopEdgeDragging ( ) ;
@@ -359,6 +359,14 @@ public override void HandleMouseUp(MouseUpEvent evt)
359359 Reset ( didConnect ) ;
360360 }
361361
362+ #if UNITY_6000_0_58_OR_NEWER
363+ public override bool HandlePointerDown ( PointerDownEvent evt ) => HandleMouseDownEvent ( evt . position ) ;
364+
365+ public override void HandlePointerMove ( PointerMoveEvent evt ) => HandleMouseMoveEvent ( ( VisualElement ) evt . target , evt . position , evt . localPosition ) ;
366+
367+ public override void HandlePointerUp ( PointerUpEvent evt ) => HandleMouseUpEvent ( evt . position ) ;
368+ #endif
369+
362370 Rect GetPortBounds ( BaseNodeView nodeView , int index , List < PortView > portList )
363371 {
364372 var port = portList [ index ] ;
0 commit comments