Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/Avalonia.Base/Threading/Dispatcher.TaskScheduler.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using System.Threading;
using System.Threading.Tasks;

namespace Avalonia.Threading;

public partial class Dispatcher
{
private TaskScheduler? _taskScheduler;

public static implicit operator TaskScheduler(Dispatcher dispatcher)
{
lock (dispatcher.InstanceLock)
{
if (dispatcher._taskScheduler == null)
{
var prevContext = SynchronizationContext.Current;
SynchronizationContext.SetSynchronizationContext(dispatcher.GetContextWithPriority(DispatcherPriority.Default));
try
{
dispatcher._taskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
}
finally
{
SynchronizationContext.SetSynchronizationContext(prevContext);
}
}
}

return dispatcher._taskScheduler;
}
}
11 changes: 11 additions & 0 deletions tests/Avalonia.Base.UnitTests/DispatcherTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -764,4 +764,15 @@ public async Task ExecutionContextCultureInfoIsPreservedInDispatcherInvokeAsync(
}
}

[Fact]
public async Task Dispatcher_Can_Act_As_TaskScheduler()
{
var impl = new SimpleDispatcherImpl();
Dispatcher.InitializeUIThreadDispatcher(impl);
Thread? continuationThread = null;
_ = Task.CompletedTask.ContinueWith(t => continuationThread = Thread.CurrentThread, Dispatcher.UIThread);
Assert.True(impl.AskedForSignal);
impl.ExecuteSignal();
Assert.Equal(Dispatcher.UIThread.Thread, continuationThread);
}
}