Browse Source

Merge branch 'master' into fixes/bidiMirrors

pull/8998/head
Benedikt Stebner 3 years ago
committed by GitHub
parent
commit
597291aa76
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/Avalonia.Base/Rendering/Composition/Compositor.cs
  2. 6
      src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs

6
src/Avalonia.Base/Rendering/Composition/Compositor.cs

@ -47,11 +47,7 @@ namespace Avalonia.Rendering.Composition
{
Loop = loop;
_server = new ServerCompositor(loop, gpu, _batchObjectPool, _batchMemoryPool);
_commit = () =>
{
Console.WriteLine("Dispatcher:Commit");
Commit();
};
_commit = () => Commit();
DefaultEasing = new CubicBezierEasing(new Point(0.25f, 0.1f), new Point(0.25f, 1f));
}

6
src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs

@ -120,10 +120,14 @@ namespace Avalonia.Win32.WinRT.Composition
private void RunLoop()
{
var cts = new CancellationTokenSource();
AppDomain.CurrentDomain.ProcessExit += (sender, args) =>
cts.Cancel();
using (var act = _compositor5.RequestCommitAsync())
act.SetCompleted(new RunLoopHandler(this));
while (true)
while (!cts.IsCancellationRequested)
{
UnmanagedMethods.GetMessage(out var msg, IntPtr.Zero, 0, 0);
lock (_pumpLock)

Loading…
Cancel
Save