Browse Source
Merge branch 'master' into platform-screen-api
pull/7165/head
Steven Kirk
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
-
src/Skia/Avalonia.Skia/FormattedTextImpl.cs
|
|
|
@ -30,7 +30,7 @@ namespace Avalonia.Threading |
|
|
|
/// <inheritdoc/>
|
|
|
|
public override void Post(SendOrPostCallback d, object? state) |
|
|
|
{ |
|
|
|
Dispatcher.UIThread.Post(() => d(state), DispatcherPriority.Send); |
|
|
|
Dispatcher.UIThread.Post(() => d(state), DispatcherPriority.Background); |
|
|
|
} |
|
|
|
|
|
|
|
/// <inheritdoc/>
|
|
|
|
|
|
|
|
@ -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) |
|
|
|
{ |
|
|
|
|
