Browse Source

Make all Render overrides sealed (#10299)

pull/10310/head
Tako 4 years ago
committed by GitHub
parent
commit
23d999c2eb
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Avalonia.Controls/Border.cs
  2. 2
      src/Avalonia.Controls/ExperimentalAcrylicBorder.cs
  3. 2
      src/Avalonia.Controls/Grid.cs
  4. 2
      src/Avalonia.Controls/Image.cs
  5. 2
      src/Avalonia.Controls/Panel.cs
  6. 2
      src/Avalonia.Controls/Presenters/ContentPresenter.cs
  7. 2
      src/Avalonia.Controls/Presenters/TextPresenter.cs
  8. 5
      src/Avalonia.Controls/Primitives/AccessText.cs
  9. 2
      src/Avalonia.Controls/Remote/RemoteWidget.cs
  10. 2
      src/Avalonia.Controls/Shapes/Shape.cs
  11. 8
      src/Avalonia.Controls/TextBlock.cs
  12. 2
      src/Avalonia.Controls/TickBar.cs

2
src/Avalonia.Controls/Border.cs

@ -225,7 +225,7 @@ namespace Avalonia.Controls
/// Renders the control. /// Renders the control.
/// </summary> /// </summary>
/// <param name="context">The drawing context.</param> /// <param name="context">The drawing context.</param>
public override void Render(DrawingContext context) public sealed override void Render(DrawingContext context)
{ {
_borderRenderHelper.Render(context, Bounds.Size, LayoutThickness, CornerRadius, Background, BorderBrush, _borderRenderHelper.Render(context, Bounds.Size, LayoutThickness, CornerRadius, Background, BorderBrush,
BoxShadow, BorderDashOffset, BorderLineCap, BorderLineJoin, BorderDashArray); BoxShadow, BorderDashOffset, BorderLineCap, BorderLineJoin, BorderDashArray);

2
src/Avalonia.Controls/ExperimentalAcrylicBorder.cs

@ -80,7 +80,7 @@ namespace Avalonia.Controls
_subscription?.Dispose(); _subscription?.Dispose();
} }
public override void Render(DrawingContext context) public sealed override void Render(DrawingContext context)
{ {
if (context.PlatformImpl is IDrawingContextWithAcrylicLikeSupport idc) if (context.PlatformImpl is IDrawingContextWithAcrylicLikeSupport idc)
{ {

2
src/Avalonia.Controls/Grid.cs

@ -3256,7 +3256,7 @@ namespace Avalonia.Controls
/// <summary> /// <summary>
/// UpdateRenderBounds. /// UpdateRenderBounds.
/// </summary> /// </summary>
public override void Render(DrawingContext drawingContext) public sealed override void Render(DrawingContext drawingContext)
{ {
var grid = this.GetVisualParent<Grid>(); var grid = this.GetVisualParent<Grid>();

2
src/Avalonia.Controls/Image.cs

@ -73,7 +73,7 @@ namespace Avalonia.Controls
/// Renders the control. /// Renders the control.
/// </summary> /// </summary>
/// <param name="context">The drawing context.</param> /// <param name="context">The drawing context.</param>
public override void Render(DrawingContext context) public sealed override void Render(DrawingContext context)
{ {
var source = Source; var source = Source;

2
src/Avalonia.Controls/Panel.cs

@ -68,7 +68,7 @@ namespace Avalonia.Controls
/// Renders the visual to a <see cref="DrawingContext"/>. /// Renders the visual to a <see cref="DrawingContext"/>.
/// </summary> /// </summary>
/// <param name="context">The drawing context.</param> /// <param name="context">The drawing context.</param>
public override void Render(DrawingContext context) public sealed override void Render(DrawingContext context)
{ {
var background = Background; var background = Background;
if (background != null) if (background != null)

2
src/Avalonia.Controls/Presenters/ContentPresenter.cs

@ -534,7 +534,7 @@ namespace Avalonia.Controls.Presenters
} }
/// <inheritdoc/> /// <inheritdoc/>
public override void Render(DrawingContext context) public sealed override void Render(DrawingContext context)
{ {
_borderRenderer.Render(context, Bounds.Size, LayoutThickness, CornerRadius, Background, BorderBrush, _borderRenderer.Render(context, Bounds.Size, LayoutThickness, CornerRadius, Background, BorderBrush,
BoxShadow); BoxShadow);

2
src/Avalonia.Controls/Presenters/TextPresenter.cs

@ -388,7 +388,7 @@ namespace Avalonia.Controls.Presenters
TextLayout.Draw(context, new Point(left, top)); TextLayout.Draw(context, new Point(left, top));
} }
public override void Render(DrawingContext context) public sealed override void Render(DrawingContext context)
{ {
var selectionStart = SelectionStart; var selectionStart = SelectionStart;
var selectionEnd = SelectionEnd; var selectionEnd = SelectionEnd;

5
src/Avalonia.Controls/Primitives/AccessText.cs

@ -60,10 +60,9 @@ namespace Avalonia.Controls.Primitives
/// Renders the <see cref="AccessText"/> to a drawing context. /// Renders the <see cref="AccessText"/> to a drawing context.
/// </summary> /// </summary>
/// <param name="context">The drawing context.</param> /// <param name="context">The drawing context.</param>
public override void Render(DrawingContext context) protected internal override void RenderCore(DrawingContext context)
{ {
base.Render(context); base.RenderCore(context);
int underscore = Text?.IndexOf('_') ?? -1; int underscore = Text?.IndexOf('_') ?? -1;
if (underscore != -1 && ShowAccessKey) if (underscore != -1 && ShowAccessKey)

2
src/Avalonia.Controls/Remote/RemoteWidget.cs

@ -69,7 +69,7 @@ namespace Avalonia.Controls.Remote
base.ArrangeCore(finalRect); base.ArrangeCore(finalRect);
} }
public override void Render(DrawingContext context) public sealed override void Render(DrawingContext context)
{ {
if (_lastFrame != null && _lastFrame.Width != 0 && _lastFrame.Height != 0) if (_lastFrame != null && _lastFrame.Width != 0 && _lastFrame.Height != 0)
{ {

2
src/Avalonia.Controls/Shapes/Shape.cs

@ -193,7 +193,7 @@ namespace Avalonia.Controls.Shapes
set { SetValue(StrokeJoinProperty, value); } set { SetValue(StrokeJoinProperty, value); }
} }
public override void Render(DrawingContext context) public sealed override void Render(DrawingContext context)
{ {
var geometry = RenderedGeometry; var geometry = RenderedGeometry;

8
src/Avalonia.Controls/TextBlock.cs

@ -549,7 +549,13 @@ namespace Avalonia.Controls
/// Renders the <see cref="TextBlock"/> to a drawing context. /// Renders the <see cref="TextBlock"/> to a drawing context.
/// </summary> /// </summary>
/// <param name="context">The drawing context.</param> /// <param name="context">The drawing context.</param>
public override void Render(DrawingContext context) public sealed override void Render(DrawingContext context)
{
RenderCore(context);
}
// Workaround to seal Render method, we need to make so because AccessText was overriding Render method which is sealed now.
internal protected virtual void RenderCore(DrawingContext context)
{ {
var background = Background; var background = Background;

2
src/Avalonia.Controls/TickBar.cs

@ -213,7 +213,7 @@ namespace Avalonia.Controls
/// ///
/// Brush that use to fill ticks is specified by Fill property. /// Brush that use to fill ticks is specified by Fill property.
/// </summary> /// </summary>
public override void Render(DrawingContext dc) public sealed override void Render(DrawingContext dc)
{ {
var size = new Size(Bounds.Width, Bounds.Height); var size = new Size(Bounds.Width, Bounds.Height);
var range = Maximum - Minimum; var range = Maximum - Minimum;

Loading…
Cancel
Save