Merge branch 'stable/0.10.x' of https://github.com/AvaloniaUI/Avalonia …

…into stable/0.10.x

samples/ControlCatalog/Pages/PointersPage.cs

@@ -1,15 +1,37 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
 
-namespace ControlCatalog.Pages
+namespace ControlCatalog.Pages;
+
+public class PointersPage : Decorator
 {
-    public class PointersPage : Control
+    public PointersPage()
+    {
+        Child = new TabControl
+        {
+            Items = new[]
+            {
+                new TabItem() { Header = "Contacts", Content = new PointerContactsTab() },
+                new TabItem() { Header = "IntermediatePoints", Content = new PointerIntermediatePointsTab() }
+            }
+        };
+    }
+
+
+    class PointerContactsTab : Control
     {
         class PointerInfo
         {
@@ -45,7 +67,7 @@ class PointerInfo
 
         private Dictionary<IPointer, PointerInfo> _pointers = new Dictionary<IPointer, PointerInfo>();
 
-        public PointersPage()
+        public PointerContactsTab()
         {
             ClipToBounds = true;
         }
@@ -104,4 +126,196 @@ public override void Render(DrawingContext context)
             }
         }
     }
+
+    public class PointerIntermediatePointsTab : Decorator
+    {
+        public PointerIntermediatePointsTab()
+        {
+            this[TextBlock.ForegroundProperty] = Brushes.Black;
+            var slider = new Slider
+            {
+                Margin = new Thickness(5),
+                Minimum = 0,
+                Maximum = 500
+            };
+
+            var status = new TextBlock()
+            {
+                HorizontalAlignment = HorizontalAlignment.Left,
+                VerticalAlignment = VerticalAlignment.Top,
+            };
+            Child = new Grid
+            {
+                Children =
+                {
+                    new PointerCanvas(slider, status),
+                    new Border
+                    {
+                        Background = Brushes.LightYellow,
+                        Child = new StackPanel
+                        {
+                            Children =
+                            {
+                                new StackPanel
+                                {
+                                    Orientation = Orientation.Horizontal,
+                                    Children =
+                                    {
+                                        new TextBlock { Text = "Thread sleep:" },
+                                        new TextBlock()
+                                        {
+                                            [!TextBlock.TextProperty] =slider.GetObservable(Slider.ValueProperty)
+                                                .Select(x=>x.ToString()).ToBinding()
+                                        }
+                                    }
+                                },
+                                slider
+                            }
+                        },
+
+                        HorizontalAlignment = HorizontalAlignment.Right,
+                        VerticalAlignment = VerticalAlignment.Top,
+                        Width = 300,
+                        Height = 60
+                    },
+                    status
+                }
+            };
+        }
+
+        class PointerCanvas : Control
+        {
+            private readonly Slider _slider;
+            private readonly TextBlock _status;
+            private int _events;
+            private Stopwatch _stopwatch = Stopwatch.StartNew();
+            private Dictionary<int, PointerPoints> _pointers = new();
+            class PointerPoints
+            {
+                struct CanvasPoint
+                {
+                    public IBrush Brush;
+                    public Point Point;
+                    public double Radius;
+                }
+
+                readonly CanvasPoint[] _points = new CanvasPoint[1000];
+                int _index;
+
+                public  void Render(DrawingContext context)
+                {
+
+                    CanvasPoint? prev = null;
+                    for (var c = 0; c < _points.Length; c++)
+                    {
+                        var i = (c + _index) % _points.Length;
+                        var pt = _points[i];
+                        if (prev.HasValue && prev.Value.Brush != null && pt.Brush != null)
+                            context.DrawLine(new Pen(Brushes.Black), prev.Value.Point, pt.Point);
+                        prev = pt;
+                        if (pt.Brush != null)
+                            context.DrawEllipse(pt.Brush, null, pt.Point, pt.Radius, pt.Radius);
+
+                    }
+
+                }
+
+                void AddPoint(Point pt, IBrush brush, double radius)
+                {
+                    _points[_index] = new CanvasPoint { Point = pt, Brush = brush, Radius = radius };
+                    _index = (_index + 1) % _points.Length;
+                }
+
+                public void HandleEvent(PointerEventArgs e, Visual v)
+                {
+                    e.Handled = true;
+                    if (e.RoutedEvent == PointerPressedEvent)
+                        AddPoint(e.GetPosition(v), Brushes.Green, 10);
+                    else if (e.RoutedEvent == PointerReleasedEvent)
+                        AddPoint(e.GetPosition(v), Brushes.Red, 10);
+                    else
+                    {
+                        var pts = e.GetIntermediatePoints(v);
+                        for (var c = 0; c < pts.Count; c++)
+                        {
+                            var pt = pts[c];
+                            AddPoint(pt.Position, c == pts.Count - 1 ? Brushes.Blue : Brushes.Black,
+                                c == pts.Count - 1 ? 5 : 2);
+                        }
+                    }
+                }
+            }
+
+            public PointerCanvas(Slider slider, TextBlock status)
+            {
+                _slider = slider;
+                _status = status;
+                DispatcherTimer.Run(() =>
+                {
+                    if (_stopwatch.Elapsed.TotalSeconds > 1)
+                    {
+                        _status.Text = "Events per second: " + (_events / _stopwatch.Elapsed.TotalSeconds);
+                        _stopwatch.Restart();
+                        _events = 0;
+                    }
+
+                    return this.GetVisualRoot() != null;
+                }, TimeSpan.FromMilliseconds(10));
+            }
+
+
+            void HandleEvent(PointerEventArgs e)
+            {
+                _events++;
+                Thread.Sleep((int)_slider.Value);
+                InvalidateVisual();
+
+                if (e.RoutedEvent == PointerReleasedEvent && e.Pointer.Type == PointerType.Touch)
+                {
+                    _pointers.Remove(e.Pointer.Id);
+                    return;
+                }
+
+                if (!_pointers.TryGetValue(e.Pointer.Id, out var pt))
+                    _pointers[e.Pointer.Id] = pt = new PointerPoints();
+                pt.HandleEvent(e, this);
+
+
+            }
+
+            public override void Render(DrawingContext context)
+            {
+                context.FillRectangle(Brushes.White, Bounds);
+                foreach(var pt in _pointers.Values)
+                    pt.Render(context);
+                base.Render(context);
+            }
+
+            protected override void OnPointerPressed(PointerPressedEventArgs e)
+            {
+                if (e.ClickCount == 2)
+                {
+                    _pointers.Clear();
+                    InvalidateVisual();
+                    return;
+                }
+
+                HandleEvent(e);
+                base.OnPointerPressed(e);
+            }
+
+            protected override void OnPointerMoved(PointerEventArgs e)
+            {
+                HandleEvent(e);
+                base.OnPointerMoved(e);
+            }
+
+            protected override void OnPointerReleased(PointerReleasedEventArgs e)
+            {
+                HandleEvent(e);
+                base.OnPointerReleased(e);
+            }
+        }
+
+    }
 }

src/Avalonia.Base/Threading/Dispatcher.cs

@@ -78,6 +78,13 @@ public void RunJobs()
         /// </summary>
         /// <param name="minimumPriority"></param>
         public void RunJobs(DispatcherPriority minimumPriority) => _jobRunner.RunJobs(minimumPriority);
+
+        /// <summary>
+        /// Use this method to check if there are more prioritized tasks
+        /// </summary>
+        /// <param name="minimumPriority"></param>
+        public bool HasJobsWithPriority(DispatcherPriority minimumPriority) =>
+            _jobRunner.HasJobsWithPriority(minimumPriority);
 
         /// <inheritdoc/>
         public Task InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)

src/Avalonia.Base/Threading/JobRunner.cs

@@ -109,7 +109,22 @@ private void AddJob(IJob job)
             }
             return null;
         }
-
+
+        public bool HasJobsWithPriority(DispatcherPriority minimumPriority)
+        {
+            for (int c = (int)minimumPriority; c < (int)DispatcherPriority.MaxValue; c++)
+            {
+                var q = _queues[c];
+                lock (q)
+                {
+                    if (q.Count > 0)
+                        return true;
+                }
+            }
+
+            return false;
+        }
+
         private interface IJob
         {
             /// <summary>

src/Avalonia.Input/MouseDevice.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
 using Avalonia.Input.Raw;
@@ -159,7 +160,7 @@ private void ProcessRawEvent(RawPointerEventArgs e)
                 case RawPointerEventType.XButton1Down:
                 case RawPointerEventType.XButton2Down:
                     if (ButtonCount(props) > 1)
-                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers);
+                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints);
                     else
                         e.Handled = MouseDown(mouse, e.Timestamp, e.Root, e.Position,
                             props, keyModifiers);
@@ -170,12 +171,12 @@ private void ProcessRawEvent(RawPointerEventArgs e)
                 case RawPointerEventType.XButton1Up:
                 case RawPointerEventType.XButton2Up:
                     if (ButtonCount(props) != 0)
-                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers);
+                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints);
                     else
                         e.Handled = MouseUp(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers);
                     break;
                 case RawPointerEventType.Move:
-                    e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers);
+                    e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints);
                     break;
                 case RawPointerEventType.Wheel:
                     e.Handled = MouseWheel(mouse, e.Timestamp, e.Root, e.Position, props, ((RawMouseWheelEventArgs)e).Delta, keyModifiers);
@@ -263,7 +264,7 @@ private bool MouseDown(IMouseDevice device, ulong timestamp, IInputElement root,
         }
 
         private bool MouseMove(IMouseDevice device, ulong timestamp, IInputRoot root, Point p, PointerPointProperties properties,
-            KeyModifiers inputModifiers)
+            KeyModifiers inputModifiers, Lazy<IReadOnlyList<RawPointerPoint>?>? intermediatePoints)
         {
             device = device ?? throw new ArgumentNullException(nameof(device));
             root = root ?? throw new ArgumentNullException(nameof(root));
@@ -283,7 +284,7 @@ private bool MouseMove(IMouseDevice device, ulong timestamp, IInputRoot root, Po
             if (source is object)
             {
                 var e = new PointerEventArgs(InputElement.PointerMovedEvent, source, _pointer, root,
-                    p, timestamp, properties, inputModifiers);
+                    p, timestamp, properties, inputModifiers, intermediatePoints);
 
                 source.RaiseEvent(e);
                 return e.Handled;