Browse Source
Merge branch 'master' into non-control-templates
pull/6665/head
Tako
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
|
|
@ -279,13 +279,13 @@ namespace Avalonia.Rendering |
|
|
/// <inheritdoc/>
|
|
|
/// <inheritdoc/>
|
|
|
Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush) |
|
|
Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush) |
|
|
{ |
|
|
{ |
|
|
return (_currentDraw.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual]?.Size ?? Size.Empty; |
|
|
return (_currentDraw?.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual]?.Size ?? Size.Empty; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <inheritdoc/>
|
|
|
/// <inheritdoc/>
|
|
|
void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush) |
|
|
void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush) |
|
|
{ |
|
|
{ |
|
|
var childScene = (_currentDraw.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual]; |
|
|
var childScene = (_currentDraw?.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual]; |
|
|
|
|
|
|
|
|
if (childScene != null) |
|
|
if (childScene != null) |
|
|
{ |
|
|
{ |
|
|
|
