Browse Source
Merge branch 'master' into issue-10226
pull/10471/head
Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
1 additions and
3 deletions
-
Avalonia.Desktop.slnf
-
src/Avalonia.Base/Media/DrawingContext.cs
-
src/Avalonia.Base/Media/DrawingGroup.cs
|
|
@ -21,6 +21,7 @@ |
|
|
"src\\Avalonia.Desktop\\Avalonia.Desktop.csproj", |
|
|
"src\\Avalonia.Desktop\\Avalonia.Desktop.csproj", |
|
|
"src\\Avalonia.Diagnostics\\Avalonia.Diagnostics.csproj", |
|
|
"src\\Avalonia.Diagnostics\\Avalonia.Diagnostics.csproj", |
|
|
"src\\Avalonia.Dialogs\\Avalonia.Dialogs.csproj", |
|
|
"src\\Avalonia.Dialogs\\Avalonia.Dialogs.csproj", |
|
|
|
|
|
"src\\Avalonia.Fonts.Inter\\Avalonia.Fonts.Inter.csproj", |
|
|
"src\\Avalonia.FreeDesktop\\Avalonia.FreeDesktop.csproj", |
|
|
"src\\Avalonia.FreeDesktop\\Avalonia.FreeDesktop.csproj", |
|
|
"src\\Avalonia.Headless.Vnc\\Avalonia.Headless.Vnc.csproj", |
|
|
"src\\Avalonia.Headless.Vnc\\Avalonia.Headless.Vnc.csproj", |
|
|
"src\\Avalonia.Headless\\Avalonia.Headless.csproj", |
|
|
"src\\Avalonia.Headless\\Avalonia.Headless.csproj", |
|
|
|
|
|
@ -277,7 +277,6 @@ namespace Avalonia.Media |
|
|
private readonly record struct RestoreState : IDisposable |
|
|
private readonly record struct RestoreState : IDisposable |
|
|
{ |
|
|
{ |
|
|
private readonly DrawingContext _context; |
|
|
private readonly DrawingContext _context; |
|
|
private readonly Matrix _matrix; |
|
|
|
|
|
private readonly PushedStateType _type; |
|
|
private readonly PushedStateType _type; |
|
|
|
|
|
|
|
|
public enum PushedStateType |
|
|
public enum PushedStateType |
|
|
|
|
|
@ -107,8 +107,6 @@ namespace Avalonia.Media |
|
|
private readonly DrawingGroup _drawingGroup; |
|
|
private readonly DrawingGroup _drawingGroup; |
|
|
private readonly IPlatformRenderInterface _platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>(); |
|
|
private readonly IPlatformRenderInterface _platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>(); |
|
|
|
|
|
|
|
|
private Matrix _transform; |
|
|
|
|
|
|
|
|
|
|
|
private bool _disposed; |
|
|
private bool _disposed; |
|
|
|
|
|
|
|
|
// Root drawing created by this DrawingContext.
|
|
|
// Root drawing created by this DrawingContext.
|
|
|
|
