Browse Source

Remove Rect.Default

pull/9590/head
robloo 3 years ago
parent
commit
3fc6a51571
  1. 4
      src/Avalonia.Base/Media/Geometry.cs
  2. 2
      src/Avalonia.Base/Media/GeometryDrawing.cs
  3. 2
      src/Avalonia.Base/Media/GlyphRunDrawing.cs
  4. 4
      src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
  5. 13
      src/Avalonia.Base/Rect.cs
  6. 2
      src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
  7. 2
      src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
  8. 2
      src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
  9. 2
      src/Avalonia.Base/Rendering/ImmediateRenderer.cs
  10. 2
      src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs
  11. 2
      src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs
  12. 2
      src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs
  13. 4
      src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
  14. 2
      src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs
  15. 6
      src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
  16. 2
      src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
  17. 2
      src/Avalonia.Controls/Flyouts/FlyoutBase.cs
  18. 2
      src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
  19. 2
      src/Browser/Avalonia.Browser/WebEmbeddableControlRoot.cs
  20. 2
      src/Skia/Avalonia.Skia/GeometryImpl.cs
  21. 2
      src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
  22. 2
      tests/Avalonia.Base.UnitTests/RectTests.cs
  23. 4
      tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
  24. 4
      tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
  25. 2
      tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
  26. 2
      tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs

4
src/Avalonia.Base/Media/Geometry.cs

@ -30,7 +30,7 @@ namespace Avalonia.Media
/// <summary>
/// Gets the geometry's bounding rectangle.
/// </summary>
public Rect Bounds => PlatformImpl?.Bounds ?? Rect.Default;
public Rect Bounds => PlatformImpl?.Bounds ?? default;
/// <summary>
/// Gets the platform-specific implementation of the geometry.
@ -84,7 +84,7 @@ namespace Avalonia.Media
/// </summary>
/// <param name="pen">The stroke thickness.</param>
/// <returns>The bounding rectangle.</returns>
public Rect GetRenderBounds(IPen pen) => PlatformImpl?.GetRenderBounds(pen) ?? Rect.Default;
public Rect GetRenderBounds(IPen pen) => PlatformImpl?.GetRenderBounds(pen) ?? default;
/// <summary>
/// Indicates whether the geometry's fill contains the specified point.

2
src/Avalonia.Base/Media/GeometryDrawing.cs

@ -69,7 +69,7 @@ namespace Avalonia.Media
public override Rect GetBounds()
{
IPen pen = Pen ?? s_boundsPen;
return Geometry?.GetRenderBounds(pen) ?? Rect.Default;
return Geometry?.GetRenderBounds(pen) ?? default;
}
}
}

2
src/Avalonia.Base/Media/GlyphRunDrawing.cs

@ -32,7 +32,7 @@
public override Rect GetBounds()
{
return GlyphRun != null ? new Rect(GlyphRun.Size) : Rect.Default;
return GlyphRun != null ? new Rect(GlyphRun.Size) : default;
}
}
}

4
src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs

@ -528,7 +528,7 @@ namespace Avalonia.Media.TextFormatting
var startX = Start;
double currentWidth = 0;
var currentRect = Rect.Default;
var currentRect = default(Rect);
TextRunBounds lastRunBounds = default;
@ -762,7 +762,7 @@ namespace Avalonia.Media.TextFormatting
var startX = WidthIncludingTrailingWhitespace;
double currentWidth = 0;
var currentRect = Rect.Default;
var currentRect = default(Rect);
for (var index = TextRuns.Count - 1; index >= 0; index--)
{

13
src/Avalonia.Base/Rect.cs

@ -16,13 +16,10 @@ namespace Avalonia
}
/// <summary>
/// A shared default instance representing an empty rectangle.
/// An empty rectangle.
/// </summary>
public static readonly Rect Default = default;
/// <inheritdoc cref="Default"/>
[Obsolete("Use Default instead.")]
public static readonly Rect Empty = Default;
[Obsolete("Use the default keyword instead.")]
public static readonly Rect Empty = default;
/// <summary>
/// The X position.
@ -398,7 +395,7 @@ namespace Avalonia
}
else
{
return Default;
return default;
}
}
@ -471,7 +468,7 @@ namespace Avalonia
double.IsNaN(rect.X) || double.IsNaN(rect.Y) ||
double.IsNaN(Height) || double.IsNaN(Width))
{
return Rect.Default;
return default;
}
if (rect.Width < 0)

2
src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs

@ -37,7 +37,7 @@ internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisua
{
if (_contentBounds == null)
{
var rect = Rect.Default;
var rect = default(Rect);
if(_renderCommands!=null)
foreach (var cmd in _renderCommands)
rect = rect.Union(cmd.Item.Bounds);

2
src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs

@ -160,7 +160,7 @@ namespace Avalonia.Rendering.Composition.Server
}
RenderedVisuals = 0;
_dirtyRect = Rect.Default;
_dirtyRect = default;
}
}

2
src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs

@ -192,7 +192,7 @@ namespace Avalonia.Rendering.Composition.Server
void AddDirtyRect(Rect rc)
{
if(rc == Rect.Default)
if(rc == default)
return;
Root?.AddDirtyRect(rc);
}

2
src/Avalonia.Base/Rendering/ImmediateRenderer.cs

@ -127,7 +127,7 @@ namespace Avalonia.Rendering
/// <inheritdoc/>
public void AddDirty(Visual visual)
{
if (visual.Bounds != Rect.Default)
if (!visual.Bounds.IsDefault)
{
var m = visual.TransformToVisual(_root);

2
src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs

@ -27,7 +27,7 @@ namespace Avalonia.Rendering.SceneGraph
}
/// <inheritdoc/>
public Rect Bounds => Rect.Default;
public Rect Bounds => default;
/// <summary>
/// Gets the BitmapBlend to be pushed or null if the operation represents a pop.

2
src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs

@ -40,7 +40,7 @@ namespace Avalonia.Rendering.SceneGraph
}
/// <inheritdoc/>
public Rect Bounds => Rect.Default;
public Rect Bounds => default;
/// <summary>
/// Gets the clip to be pushed or null if the operation represents a pop.

2
src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs

@ -28,7 +28,7 @@ namespace Avalonia.Rendering.SceneGraph
}
/// <inheritdoc/>
public Rect Bounds => Rect.Default;
public Rect Bounds => default;
/// <summary>
/// Gets the clip to be pushed or null if the operation represents a pop.

4
src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs

@ -19,7 +19,7 @@ namespace Avalonia.Rendering.SceneGraph
/// <param name="bounds">The bounds of the mask.</param>
/// <param name="aux">Auxiliary data required to draw the brush.</param>
public OpacityMaskNode(IBrush mask, Rect bounds, IDisposable? aux = null)
: base(Rect.Default, Matrix.Identity, aux)
: base(default, Matrix.Identity, aux)
{
Mask = mask.ToImmutable();
MaskBounds = bounds;
@ -30,7 +30,7 @@ namespace Avalonia.Rendering.SceneGraph
/// opacity mask pop.
/// </summary>
public OpacityMaskNode()
: base(Rect.Default, Matrix.Identity, null)
: base(default, Matrix.Identity, null)
{
}

2
src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs

@ -26,7 +26,7 @@ namespace Avalonia.Rendering.SceneGraph
}
/// <inheritdoc/>
public Rect Bounds => Rect.Default;
public Rect Bounds => default;
/// <summary>
/// Gets the opacity to be pushed or null if the operation represents a pop.

6
src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs

@ -331,8 +331,8 @@ namespace Avalonia.Rendering.SceneGraph
scene.Size = newSize;
Rect horizontalDirtyRect = Rect.Default;
Rect verticalDirtyRect = Rect.Default;
Rect horizontalDirtyRect = default;
Rect verticalDirtyRect = default;
if (newSize.Width > oldSize.Width)
{
@ -429,7 +429,7 @@ namespace Avalonia.Rendering.SceneGraph
else
{
layer.OpacityMask = null;
layer.OpacityMaskRect = Rect.Default;
layer.OpacityMaskRect = default;
}
layer.GeometryClip = node.HasAncestorGeometryClip ?

2
src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs

@ -161,7 +161,7 @@ namespace Avalonia.Controls.Primitives
{
// Clip
RectangleGeometry rg = new RectangleGeometry();
rg.Rect = Rect.Default;
rg.Rect = default;
cell.Clip = rg;
}
}

2
src/Avalonia.Controls/Flyouts/FlyoutBase.cs

@ -457,7 +457,7 @@ namespace Avalonia.Controls.Primitives
PopupPositioning.PopupPositionerConstraintAdjustment.SlideY;
}
var trgtBnds = Target?.Bounds ?? Rect.Default;
var trgtBnds = Target?.Bounds ?? default;
switch (Placement)
{

2
src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs

@ -212,7 +212,7 @@ namespace Avalonia.Headless
class HeadlessStreamingGeometryStub : HeadlessGeometryStub, IStreamGeometryImpl
{
public HeadlessStreamingGeometryStub() : base(Rect.Default)
public HeadlessStreamingGeometryStub() : base(default)
{
}

2
src/Browser/Avalonia.Browser/WebEmbeddableControlRoot.cs

@ -18,7 +18,7 @@ namespace Avalonia.Browser
_onFirstRender = onFirstRender;
}
public Rect Bounds => Rect.Default;
public Rect Bounds => default;
public bool HasRendered => _hasRendered;

2
src/Skia/Avalonia.Skia/GeometryImpl.cs

@ -244,7 +244,7 @@ namespace Avalonia.Skia
public void Invalidate()
{
CachedStrokePath?.Dispose();
CachedGeometryRenderBounds = Rect.Default;
CachedGeometryRenderBounds = default;
_cachedStrokeWidth = default(float);
}
}

2
src/Skia/Avalonia.Skia/StreamGeometryImpl.cs

@ -34,7 +34,7 @@ namespace Avalonia.Skia
/// <summary>
/// Initializes a new instance of the <see cref="StreamGeometryImpl"/> class.
/// </summary>
public StreamGeometryImpl() : this(CreateEmptyPath(), Rect.Default)
public StreamGeometryImpl() : this(CreateEmptyPath(), default)
{
}

2
tests/Avalonia.Base.UnitTests/RectTests.cs

@ -52,7 +52,7 @@ namespace Avalonia.Base.UnitTests
double.PositiveInfinity, double.PositiveInfinity)
.Normalize();
Assert.Equal(Rect.Default, result);
Assert.Equal(default, result);
}
}
}

4
tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs

@ -403,7 +403,7 @@ namespace Avalonia.Base.UnitTests.Rendering
root.Measure(Size.Infinity);
root.Arrange(new Rect(container.DesiredSize));
root.Renderer.Paint(Rect.Default);
root.Renderer.Paint(default);
var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
Assert.Equal(item1, result);
@ -419,7 +419,7 @@ namespace Avalonia.Base.UnitTests.Rendering
container.InvalidateArrange();
container.Arrange(new Rect(container.DesiredSize));
root.Renderer.Paint(Rect.Default);
root.Renderer.Paint(default);
result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
Assert.Equal(item2, result);

4
tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs

@ -13,9 +13,9 @@ namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
[Fact]
public void Empty_Bounds_Remain_Empty()
{
var target = new TestDrawOperation(Rect.Default, Matrix.Identity, null);
var target = new TestDrawOperation(default, Matrix.Identity, null);
Assert.Equal(Rect.Default, target.Bounds);
Assert.Equal(default, target.Bounds);
}
[Theory]

2
tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs

@ -570,7 +570,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
var items = (IList<string>)target.Items;
target.ApplyTemplate();
target.Measure(Size.Empty);
target.Arrange(Rect.Default);
target.Arrange(default);
// Check for issue #591: this should not throw.
target.ScrollIntoView(0);

2
tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs

@ -18,7 +18,7 @@ namespace Avalonia.Controls.UnitTests.Shapes
target.Measure(new Size(100, 100));
var geometry = Assert.IsType<RectangleGeometry>(target.RenderedGeometry);
Assert.Equal(Rect.Default, geometry.Rect);
Assert.Equal(default, geometry.Rect);
}
[Fact]

Loading…
Cancel
Save