Browse Source

Remove ICustomDrawOperation from the IDrawingContextImpl as it seems useless there now

pull/11189/head
Max Katz 4 years ago
parent
commit
cc0e2302e7
  1. 1
      src/Avalonia.Base/Media/ImmediateDrawingContext.cs
  2. 7
      src/Avalonia.Base/Platform/IDrawingContextImpl.cs
  3. 5
      src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
  4. 7
      src/Headless/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
  5. 9
      src/Skia/Avalonia.Skia/DrawingContextImpl.cs
  6. 5
      src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs

1
src/Avalonia.Base/Media/ImmediateDrawingContext.cs

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using Avalonia.Platform;
using Avalonia.Rendering.SceneGraph;
using Avalonia.Threading;
using Avalonia.Utilities;
using Avalonia.Media.Imaging;

7
src/Avalonia.Base/Platform/IDrawingContextImpl.cs

@ -1,6 +1,5 @@
using System;
using Avalonia.Media;
using Avalonia.Rendering.SceneGraph;
using Avalonia.Utilities;
using Avalonia.Media.Imaging;
using Avalonia.Metadata;
@ -168,12 +167,6 @@ namespace Avalonia.Platform
/// </summary>
void PopBitmapBlendMode();
/// <summary>
/// Adds a custom draw operation
/// </summary>
/// <param name="custom">Custom draw operation</param>
void Custom(ICustomDrawOperation custom);
/// <summary>
/// Attempts to get an optional feature from the drawing context implementation
/// </summary>

5
src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs

@ -143,11 +143,6 @@ internal class CompositorDrawingContextProxy : IDrawingContextImpl,
_impl.PopBitmapBlendMode();
}
public void Custom(ICustomDrawOperation custom)
{
_impl.Custom(custom);
}
public object? GetFeature(Type t) => _impl.GetFeature(t);

7
src/Headless/Avalonia.Headless/HeadlessPlatformRenderInterface.cs

@ -433,12 +433,7 @@ namespace Avalonia.Headless
{
}
public void Custom(ICustomDrawOperation custom)
{
}
public object? GetFeature(Type t)
{
return null;

9
src/Skia/Avalonia.Skia/DrawingContextImpl.cs

@ -5,12 +5,9 @@ using System.Linq;
using System.Threading;
using Avalonia.Media;
using Avalonia.Platform;
using Avalonia.Rendering;
using Avalonia.Rendering.SceneGraph;
using Avalonia.Rendering.Utilities;
using Avalonia.Utilities;
using Avalonia.Media.Imaging;
using Avalonia.Skia.Helpers;
using SkiaSharp;
using ISceneBrush = Avalonia.Media.ISceneBrush;
@ -667,12 +664,6 @@ namespace Avalonia.Skia
_currentBlendingMode = _blendingModeStack.Pop();
}
public void Custom(ICustomDrawOperation custom)
{
CheckLease();
custom.Render(this);
}
/// <inheritdoc />
public void PushOpacityMask(IBrush mask, Rect bounds)
{

5
src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs

@ -3,8 +3,6 @@ using System.Collections.Generic;
using System.Numerics;
using Avalonia.Media;
using Avalonia.Platform;
using Avalonia.Rendering;
using Avalonia.Rendering.SceneGraph;
using Avalonia.Utilities;
using Avalonia.Media.Imaging;
using SharpDX;
@ -608,8 +606,7 @@ namespace Avalonia.Direct2D1.Media
{
PopLayer();
}
public void Custom(ICustomDrawOperation custom) => custom.Render(this);
public object GetFeature(Type t) => null;
}
}

Loading…
Cancel
Save