switch to using animation request for scroll inertia dispatch

Author: emmauss

src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Diagnostics;
+using System.Security.Cryptography;
+using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Threading;
 
@@ -25,14 +27,18 @@ public class ScrollGestureRecognizer : GestureRecognizer
         private VelocityTracker? _velocityTracker;
 
         // Movement per second
-        private Vector _inertia;
+        private Vector? _inertia;
         private ulong? _lastMoveTimestamp;
+        private TimeSpan _lastTime;
+        private TimeSpan _inertiaStartTime;
+        private int _currentInertiaGestureId;
+        private DispatcherOperation? _inertiaDispatchOperation;
 
         /// <summary>
         /// Defines the <see cref="CanHorizontallyScroll"/> property.
         /// </summary>
         public static readonly DirectProperty<ScrollGestureRecognizer, bool> CanHorizontallyScrollProperty =
-            AvaloniaProperty.RegisterDirect<ScrollGestureRecognizer, bool>(nameof(CanHorizontallyScroll), 
+            AvaloniaProperty.RegisterDirect<ScrollGestureRecognizer, bool>(nameof(CanHorizontallyScroll),
                 o => o.CanHorizontallyScroll, (o, v) => o.CanHorizontallyScroll = v);
 
         /// <summary>
@@ -47,7 +53,7 @@ public class ScrollGestureRecognizer : GestureRecognizer
         /// </summary>
         public static readonly DirectProperty<ScrollGestureRecognizer, bool> IsScrollInertiaEnabledProperty =
             AvaloniaProperty.RegisterDirect<ScrollGestureRecognizer, bool>(nameof(IsScrollInertiaEnabled),
-                o => o.IsScrollInertiaEnabled, (o,v) => o.IsScrollInertiaEnabled = v);
+                o => o.IsScrollInertiaEnabled, (o, v) => o.IsScrollInertiaEnabled = v);
 
         /// <summary>
         /// Defines the <see cref="ScrollStartDistance"/> property.
@@ -102,6 +108,7 @@ protected override void PointerPressed(PointerPressedEventArgs e)
             {
                 EndGesture();
                 _tracking = e.Pointer;
+                _inertia = null;
                 _gestureId = ScrollGestureEventArgs.GetNextFreeId();
                 _trackedRootPoint = _pointerPressedPoint = point.Position;
                 _velocityTracker = new VelocityTracker();
@@ -121,7 +128,7 @@ protected override void PointerMoved(PointerEventArgs e)
                     if (CanVerticallyScroll && Math.Abs(_trackedRootPoint.Y - rootPoint.Y) > ScrollStartDistance)
                         _scrolling = true;
                     if (_scrolling)
-                    {                        
+                    {
                         // Correct _trackedRootPoint with ScrollStartDistance, so scrolling does not start with a skip of ScrollStartDistance
                         _trackedRootPoint = new Point(
                             _trackedRootPoint.X - (_trackedRootPoint.X >= rootPoint.X ? ScrollStartDistance : -ScrollStartDistance),
@@ -147,7 +154,8 @@ protected override void PointerMoved(PointerEventArgs e)
 
         protected override void PointerCaptureLost(IPointer pointer)
         {
-            if (pointer == _tracking) EndGesture();
+            if (pointer == _tracking)
+                EndGesture();
         }
 
         void EndGesture()
@@ -161,7 +169,9 @@ void EndGesture()
                 _gestureId = 0;
                 _lastMoveTimestamp = null;
             }
-            
+
+            _inertiaDispatchOperation = null;
+
         }
 
 
@@ -181,53 +191,75 @@ protected override void PointerReleased(PointerReleasedEventArgs e)
                 else
                 {
                     _tracking = null;
-                    var savedGestureId = _gestureId;
-                    var st = Stopwatch.StartNew();
-                    var lastTime = TimeSpan.Zero;
-                    Target!.RaiseEvent(new ScrollGestureInertiaStartingEventArgs(_gestureId, _inertia));
-                    DispatcherTimer.Run(() =>
-                    {
-                        // Another gesture has started, finish the current one
-                        if (_gestureId != savedGestureId)
-                        {
-                            return false;
-                        }
-
-                        var elapsedSinceLastTick = st.Elapsed - lastTime;
-                        lastTime = st.Elapsed;
-
-                        var speed = _inertia * Math.Pow(InertialResistance, st.Elapsed.TotalSeconds);
-                        var distance = speed * elapsedSinceLastTick.TotalSeconds;
-                        var scrollGestureEventArgs = new ScrollGestureEventArgs(_gestureId, distance);
-                        Target!.RaiseEvent(scrollGestureEventArgs);
-
-                        if (!scrollGestureEventArgs.Handled || scrollGestureEventArgs.ShouldEndScrollGesture)
-                        {
-                            EndGesture();
-                            return false;
-                        }
-
-                        // EndGesture using InertialScrollSpeedEnd only in the direction of scrolling
-                        if (CanVerticallyScroll && CanHorizontallyScroll && Math.Abs(speed.X) < InertialScrollSpeedEnd && Math.Abs(speed.Y) <= InertialScrollSpeedEnd)
-                        {
-                            EndGesture();
-                            return false;
-                        }
-                        else if (CanVerticallyScroll && Math.Abs(speed.Y) <= InertialScrollSpeedEnd)
-                        {
-                            EndGesture();
-                            return false;
-                        }
-                        else if (CanHorizontallyScroll && Math.Abs(speed.X) < InertialScrollSpeedEnd)
-                        {
-                            EndGesture();
-                            return false;
-                        }
-
-                        return true;
-                    }, TimeSpan.FromMilliseconds(16), DispatcherPriority.Background);
+
+                    MediaContext.Instance.RequestAnimationFrame(StartInertia);
                 }
             }
         }
+
+        private void StartInertia(TimeSpan timeSpan)
+        {
+            if (_inertia is { } inertia)
+            {
+                _lastTime = timeSpan;
+                _inertiaStartTime = timeSpan;
+                _currentInertiaGestureId = _gestureId;
+                Target!.RaiseEvent(new ScrollGestureInertiaStartingEventArgs(_gestureId, inertia));
+
+                MediaContext.Instance.RequestAnimationFrame(OnAnimationRequested);
+            }
+        }
+
+        private void OnAnimationRequested(TimeSpan timeSpan)
+        {
+            // Another gesture has started, finish the current one
+            if (_gestureId != _currentInertiaGestureId || _inertia == null)
+            {
+                _inertia = null;
+                return;
+            }
+
+            var elapsedSinceLastTick = timeSpan - _lastTime;
+            _lastTime = timeSpan;
+
+            var speed = _inertia * Math.Pow(InertialResistance, (_lastTime - _inertiaStartTime).TotalSeconds);
+            var distance = speed * elapsedSinceLastTick.TotalSeconds;
+            _inertiaDispatchOperation = Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                if (speed is not { } && distance is not { })
+                {
+                    EndGesture();
+                    return;
+                }
+                var scrollGestureEventArgs = new ScrollGestureEventArgs(_gestureId, distance!.Value);
+                Target!.RaiseEvent(scrollGestureEventArgs);
+
+                if (!scrollGestureEventArgs.Handled || scrollGestureEventArgs.ShouldEndScrollGesture)
+                {
+                    EndGesture();
+                    return;
+                }
+
+                var sp = speed!.Value;
+
+                // EndGesture using InertialScrollSpeedEnd only in the direction of scrolling
+                if (CanVerticallyScroll && CanHorizontallyScroll && Math.Abs(sp.X) < InertialScrollSpeedEnd && Math.Abs(sp.Y) <= InertialScrollSpeedEnd)
+                {
+                    return;
+                }
+                else if (CanVerticallyScroll && Math.Abs(sp.Y) <= InertialScrollSpeedEnd)
+                {
+                    EndGesture();
+                    return;
+                }
+                else if (CanHorizontallyScroll && Math.Abs(sp.X) < InertialScrollSpeedEnd)
+                {
+                    EndGesture();
+                    return;
+                }
+            }, DispatcherPriority.Input);
+
+            MediaContext.Instance.RequestAnimationFrame(OnAnimationRequested);
+        }
     }
 }