Преглед изворни кода

Merge branch 'master' into issue-10226

Max Katz пре 2 година
родитељ
комит
d76f8e6692

+ 1 - 0
Avalonia.Desktop.slnf

@@ -21,6 +21,7 @@
       "src\\Avalonia.Desktop\\Avalonia.Desktop.csproj",
       "src\\Avalonia.Diagnostics\\Avalonia.Diagnostics.csproj",
       "src\\Avalonia.Dialogs\\Avalonia.Dialogs.csproj",
+      "src\\Avalonia.Fonts.Inter\\Avalonia.Fonts.Inter.csproj",
       "src\\Avalonia.FreeDesktop\\Avalonia.FreeDesktop.csproj",
       "src\\Avalonia.Headless.Vnc\\Avalonia.Headless.Vnc.csproj",
       "src\\Avalonia.Headless\\Avalonia.Headless.csproj",

+ 0 - 1
src/Avalonia.Base/Media/DrawingContext.cs

@@ -277,7 +277,6 @@ namespace Avalonia.Media
         private readonly record struct RestoreState : IDisposable
         {
             private readonly DrawingContext _context;
-            private readonly Matrix _matrix;
             private readonly PushedStateType _type;
 
             public enum PushedStateType

+ 0 - 2
src/Avalonia.Base/Media/DrawingGroup.cs

@@ -107,8 +107,6 @@ namespace Avalonia.Media
             private readonly DrawingGroup _drawingGroup;
             private readonly IPlatformRenderInterface _platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
 
-            private Matrix _transform;
-
             private bool _disposed;
 
             // Root drawing created by this DrawingContext.