From 2ae07d3277ae5b55bc66831e8355ddba9873d4da Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 11 Jan 2022 15:24:19 +0100 Subject: [PATCH 1/2] Reduce the priority in AvaloniaSynchronizationContext. `AvaloniaSynchronizationContext` was previously queuing continuations with `Send` priority, which is the maximum. This was causing the problem described in https://github.com/AvaloniaUI/Avalonia/issues/6930#issuecomment-1008888711. Decrease the priority so that continuations don't get called during `Window` construction on macOS. --- src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs index b991f9eb40..21649306cb 100644 --- a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs +++ b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs @@ -30,7 +30,7 @@ namespace Avalonia.Threading /// public override void Post(SendOrPostCallback d, object? state) { - Dispatcher.UIThread.Post(() => d(state), DispatcherPriority.Send); + Dispatcher.UIThread.Post(() => d(state), DispatcherPriority.Background); } /// From 735dc915fe21a8bc1adef3c5b05f01767e79f2cc Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 12 Jan 2022 11:44:34 +0100 Subject: [PATCH 2/2] Fix Skia FormattedTextImpl text alignment --- src/Skia/Avalonia.Skia/FormattedTextImpl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs index 81a79201d0..625d1c6f52 100644 --- a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs +++ b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs @@ -291,7 +291,7 @@ namespace Avalonia.Skia { AvaloniaFormattedTextLine line = _skiaLines[c]; - float x = TransformX(origin.X, 0, paint.TextAlign); + float x = TransformX(origin.X, line.Width, paint.TextAlign); if (!hasCusomFGBrushes) {