From 8fe2c5b7cb3345867ece264aef57610d942495e6 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Thu, 1 Dec 2022 19:25:49 -0500
Subject: [PATCH 01/11] Standardize IsDefault member in CornerRadius

---
 src/Avalonia.Base/CornerRadius.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Base/CornerRadius.cs b/src/Avalonia.Base/CornerRadius.cs
index 893f7c4565..67ef79f752 100644
--- a/src/Avalonia.Base/CornerRadius.cs
+++ b/src/Avalonia.Base/CornerRadius.cs
@@ -61,9 +61,13 @@ namespace Avalonia
         public double BottomLeft { get; }
 
         /// <summary>
-        /// Gets a value indicating whether all corner radii are set to 0.
+        /// Gets a value indicating whether the instance has default values (all corner radii are set to 0).
         /// </summary>
-        public bool IsEmpty => TopLeft.Equals(0) && IsUniform;
+        public bool IsDefault => TopLeft == 0 && TopRight == 0 && BottomLeft == 0 && BottomRight == 0;
+
+        /// <inheritdoc cref="IsDefault"/>
+        [Obsolete("Use IsDefault instead.")]
+        public bool IsEmpty => IsDefault;
 
         /// <summary>
         /// Gets a value indicating whether all corner radii are equal.
@@ -79,7 +83,6 @@ namespace Avalonia
         {
             // ReSharper disable CompareOfFloatsByEqualityOperator
             return TopLeft == other.TopLeft &&
-                   
                    TopRight == other.TopRight &&
                    BottomRight == other.BottomRight &&
                    BottomLeft == other.BottomLeft;

From 9634a2cccf3419771ad1bbe0a35d998285075cf6 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Thu, 1 Dec 2022 19:26:19 -0500
Subject: [PATCH 02/11] Standardize IsDefault member in BoxShadow

---
 src/Avalonia.Base/Media/BoxShadow.cs         | 11 +++++++++--
 src/Avalonia.Base/Media/BoxShadows.cs        |  4 ++--
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Base/Media/BoxShadow.cs b/src/Avalonia.Base/Media/BoxShadow.cs
index cc97d89cfc..a9f073df67 100644
--- a/src/Avalonia.Base/Media/BoxShadow.cs
+++ b/src/Avalonia.Base/Media/BoxShadow.cs
@@ -45,7 +45,14 @@ namespace Avalonia.Media
             }
         }
 
-        public bool IsEmpty => OffsetX == 0 && OffsetY == 0 && Blur == 0 && Spread == 0;
+        /// <summary>
+        /// Gets a value indicating whether the instance has default values.
+        /// </summary>
+        public bool IsDefault => OffsetX == 0 && OffsetY == 0 && Blur == 0 && Spread == 0;
+
+        /// <inheritdoc cref="IsDefault"/>
+        [Obsolete("Use IsDefault instead.")]
+        public bool IsEmpty => IsDefault;
 
         private readonly static char[] s_Separator = new char[] { ' ', '\t' };
 
@@ -82,7 +89,7 @@ namespace Avalonia.Media
         {
             var sb = StringBuilderCache.Acquire();
 
-            if (IsEmpty)
+            if (IsDefault)
             {
                 return "none";
             }
diff --git a/src/Avalonia.Base/Media/BoxShadows.cs b/src/Avalonia.Base/Media/BoxShadows.cs
index ab2694389f..136f37a42b 100644
--- a/src/Avalonia.Base/Media/BoxShadows.cs
+++ b/src/Avalonia.Base/Media/BoxShadows.cs
@@ -21,7 +21,7 @@ namespace Avalonia.Media
         {
             _first = shadow;
             _list = null;
-            Count = _first.IsEmpty ? 0 : 1;
+            Count = _first.IsDefault ? 0 : 1;
         }
 
         public BoxShadows(BoxShadow first, BoxShadow[] rest)
@@ -118,7 +118,7 @@ namespace Avalonia.Media
             get
             {
                 foreach(var boxShadow in this)
-                    if (!boxShadow.IsEmpty && boxShadow.IsInset)
+                    if (!boxShadow.IsDefault && boxShadow.IsInset)
                         return true;
                 return false;
             }
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 6dcafdcfd7..0a1bbe558b 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -362,7 +362,7 @@ namespace Avalonia.Skia
 
             foreach (var boxShadow in boxShadows)
             {
-                if (!boxShadow.IsEmpty && !boxShadow.IsInset)
+                if (!boxShadow.IsDefault && !boxShadow.IsInset)
                 {
                     using (var shadow = BoxShadowFilter.Create(_boxShadowPaint, boxShadow, _currentOpacity))
                     {
@@ -418,7 +418,7 @@ namespace Avalonia.Skia
 
             foreach (var boxShadow in boxShadows)
             {
-                if (!boxShadow.IsEmpty && boxShadow.IsInset)
+                if (!boxShadow.IsDefault && boxShadow.IsInset)
                 {
                     using (var shadow = BoxShadowFilter.Create(_boxShadowPaint, boxShadow, _currentOpacity))
                     {

From 06a6284ee48c3ed716ae8999145b9efe10aa1e44 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Thu, 1 Dec 2022 19:39:38 -0500
Subject: [PATCH 03/11] Standardize IsDefault member in PixelRect

---
 src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs |  2 +-
 src/Avalonia.Base/PixelRect.cs                   | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs b/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs
index 70f9fbf567..ac462aeb72 100644
--- a/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs
+++ b/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs
@@ -79,7 +79,7 @@ namespace Avalonia.Media.Imaging
             {
                 if (Source is not IBitmap bmp)
                     return Size.Empty;
-                if (SourceRect.IsEmpty)
+                if (SourceRect.IsDefault)
                     return Source.Size;
                 return SourceRect.Size.ToSizeWithDpi(bmp.Dpi);
             }
diff --git a/src/Avalonia.Base/PixelRect.cs b/src/Avalonia.Base/PixelRect.cs
index 855ba104ad..343bbccc9a 100644
--- a/src/Avalonia.Base/PixelRect.cs
+++ b/src/Avalonia.Base/PixelRect.cs
@@ -133,9 +133,13 @@ namespace Avalonia
         public PixelPoint Center => new PixelPoint(X + (Width / 2), Y + (Height / 2));
 
         /// <summary>
-        /// Gets a value that indicates whether the rectangle is empty.
+        /// Gets a value indicating whether the instance has default values.
         /// </summary>
-        public bool IsEmpty => Width == 0 && Height == 0;
+        public bool IsDefault => Width == 0 && Height == 0;
+
+        /// <inheritdoc cref="IsDefault"/>
+        [Obsolete("Use IsDefault instead.")]
+        public bool IsEmpty => IsDefault;
 
         /// <summary>
         /// Checks for equality between two <see cref="PixelRect"/>s.
@@ -290,11 +294,11 @@ namespace Avalonia
         /// <returns>The union.</returns>
         public PixelRect Union(PixelRect rect)
         {
-            if (IsEmpty)
+            if (IsDefault)
             {
                 return rect;
             }
-            else if (rect.IsEmpty)
+            else if (rect.IsDefault)
             {
                 return this;
             }

From b8a1aaa329e10190afd31aae324c8cbf7b180f36 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Thu, 1 Dec 2022 20:49:19 -0500
Subject: [PATCH 04/11] Standardize IsDefault member in Rect

---
 src/Avalonia.Base/Media/FormattedText.cs           |  2 +-
 src/Avalonia.Base/Media/ImageDrawing.cs            |  2 +-
 src/Avalonia.Base/PixelRect.cs                     |  2 +-
 src/Avalonia.Base/Rect.cs                          | 14 +++++++++-----
 .../Composition/Server/ServerCompositionTarget.cs  |  6 +++---
 .../Composition/Server/ServerCompositionVisual.cs  |  6 +++---
 src/Avalonia.Base/Rendering/DeferredRenderer.cs    |  2 +-
 src/Avalonia.Base/Rendering/DirtyRects.cs          |  2 +-
 .../DataGridCheckBoxColumn.cs                      |  4 ++--
 src/Avalonia.Controls/NativeControlHost.cs         |  2 +-
 .../PopupPositioning/ManagedPopupPositioner.cs     |  2 +-
 src/Avalonia.Controls/Repeater/ViewportManager.cs  |  4 ++--
 12 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/Avalonia.Base/Media/FormattedText.cs b/src/Avalonia.Base/Media/FormattedText.cs
index 90b9755493..87dca16205 100644
--- a/src/Avalonia.Base/Media/FormattedText.cs
+++ b/src/Avalonia.Base/Media/FormattedText.cs
@@ -1383,7 +1383,7 @@ namespace Avalonia.Media
                 }
             }
 
-            if (accumulatedBounds?.PlatformImpl == null || accumulatedBounds.PlatformImpl.Bounds.IsEmpty)
+            if (accumulatedBounds?.PlatformImpl == null || accumulatedBounds.PlatformImpl.Bounds.IsDefault)
             {
                 return null;
             }            
diff --git a/src/Avalonia.Base/Media/ImageDrawing.cs b/src/Avalonia.Base/Media/ImageDrawing.cs
index 82f97b52b4..d3e5c4841b 100644
--- a/src/Avalonia.Base/Media/ImageDrawing.cs
+++ b/src/Avalonia.Base/Media/ImageDrawing.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Media
             var imageSource = ImageSource;
             var rect = Rect;
 
-            if (imageSource is object && !rect.IsEmpty)
+            if (imageSource is object && !rect.IsDefault)
             {
                 context.DrawImage(imageSource, rect);
             }
diff --git a/src/Avalonia.Base/PixelRect.cs b/src/Avalonia.Base/PixelRect.cs
index 343bbccc9a..409a259182 100644
--- a/src/Avalonia.Base/PixelRect.cs
+++ b/src/Avalonia.Base/PixelRect.cs
@@ -133,7 +133,7 @@ namespace Avalonia
         public PixelPoint Center => new PixelPoint(X + (Width / 2), Y + (Height / 2));
 
         /// <summary>
-        /// Gets a value indicating whether the instance has default values.
+        /// Gets a value indicating whether the instance has default values (the rectangle is empty).
         /// </summary>
         public bool IsDefault => Width == 0 && Height == 0;
 
diff --git a/src/Avalonia.Base/Rect.cs b/src/Avalonia.Base/Rect.cs
index a91b089a33..862e4caec1 100644
--- a/src/Avalonia.Base/Rect.cs
+++ b/src/Avalonia.Base/Rect.cs
@@ -169,12 +169,16 @@ namespace Avalonia
         public Point Center => new Point(_x + (_width / 2), _y + (_height / 2));
 
         /// <summary>
-        /// Gets a value that indicates whether the rectangle is empty.
+        /// Gets a value indicating whether the instance has default values (the rectangle is empty).
         /// </summary>
         // ReSharper disable CompareOfFloatsByEqualityOperator
-        public bool IsEmpty => _width == 0 && _height == 0;
+        public bool IsDefault => _width == 0 && _height == 0;
         // ReSharper restore CompareOfFloatsByEqualityOperator
 
+        /// <inheritdoc cref="IsDefault"/>
+        [Obsolete("Use IsDefault instead.")]
+        public bool IsEmpty => IsDefault;
+
         /// <summary>
         /// Checks for equality between two <see cref="Rect"/>s.
         /// </summary>
@@ -457,7 +461,7 @@ namespace Avalonia
 		/// </remarks>
 		public Rect Normalize()
         {
-            Rect rect = this;            
+            Rect rect = this;
 
             if(double.IsNaN(rect.Right) || double.IsNaN(rect.Bottom) || 
                 double.IsNaN(rect.X) || double.IsNaN(rect.Y) || 
@@ -493,11 +497,11 @@ namespace Avalonia
             /// <returns>The union.</returns>
             public Rect Union(Rect rect)
         {
-            if (IsEmpty)
+            if (IsDefault)
             {
                 return rect;
             }
-            else if (rect.IsEmpty)
+            else if (rect.IsDefault)
             {
                 return this;
             }
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
index 5c1ac0312c..a8fcdc41cd 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -89,7 +89,7 @@ namespace Avalonia.Rendering.Composition.Server
 
             Compositor.UpdateServerTime();
             
-            if(_dirtyRect.IsEmpty && !_redrawRequested)
+            if(_dirtyRect.IsDefault && !_redrawRequested)
                 return;
 
             Revision++;
@@ -117,7 +117,7 @@ namespace Avalonia.Rendering.Composition.Server
                     _layerSize = layerSize;
                 }
 
-                if (!_dirtyRect.IsEmpty)
+                if (!_dirtyRect.IsDefault)
                 {
                     var visualBrushHelper = new CompositorDrawingContextProxy.VisualBrushRenderer();
                     using (var context = _layer.CreateDrawingContext(visualBrushHelper))
@@ -179,7 +179,7 @@ namespace Avalonia.Rendering.Composition.Server
         
         public void AddDirtyRect(Rect rect)
         {
-            if(rect.IsEmpty)
+            if(rect.IsDefault)
                 return;
             var snapped = SnapToDevicePixels(rect, Scaling);
             DebugEvents?.RectInvalidated(rect);
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
index d724e14298..5e6dcab209 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
@@ -37,7 +37,7 @@ namespace Avalonia.Rendering.Composition.Server
                 return;
 
             currentTransformedClip = currentTransformedClip.Intersect(_combinedTransformedClipBounds);
-            if(currentTransformedClip.IsEmpty)
+            if(currentTransformedClip.IsDefault)
                 return;
 
             Root!.RenderedVisuals++;
@@ -139,7 +139,7 @@ namespace Avalonia.Rendering.Composition.Server
             if (ownBounds != _oldOwnContentBounds || positionChanged)
             {
                 _oldOwnContentBounds = ownBounds;
-                if (ownBounds.IsEmpty)
+                if (ownBounds.IsDefault)
                     TransformedOwnContentBounds = default;
                 else
                     TransformedOwnContentBounds =
@@ -163,7 +163,7 @@ namespace Avalonia.Rendering.Composition.Server
             EffectiveOpacity = Opacity * (Parent?.EffectiveOpacity ?? 1);
 
             IsVisibleInFrame = _parent?.IsVisibleInFrame != false && Visible && EffectiveOpacity > 0.04 && !_isBackface &&
-                               !_combinedTransformedClipBounds.IsEmpty;
+                               !_combinedTransformedClipBounds.IsDefault;
 
             if (wasVisible != IsVisibleInFrame || positionChanged)
             {
diff --git a/src/Avalonia.Base/Rendering/DeferredRenderer.cs b/src/Avalonia.Base/Rendering/DeferredRenderer.cs
index 971702269c..33820a0eac 100644
--- a/src/Avalonia.Base/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Base/Rendering/DeferredRenderer.cs
@@ -420,7 +420,7 @@ namespace Avalonia.Rendering
             {
                 clipBounds = node.ClipBounds.Intersect(clipBounds);
 
-                if (!clipBounds.IsEmpty && node.Opacity > 0)
+                if (!clipBounds.IsDefault && node.Opacity > 0)
                 {
                     var isLayerRoot = node.Visual == layer;
 
diff --git a/src/Avalonia.Base/Rendering/DirtyRects.cs b/src/Avalonia.Base/Rendering/DirtyRects.cs
index f4b6a6b6ce..e4238f8308 100644
--- a/src/Avalonia.Base/Rendering/DirtyRects.cs
+++ b/src/Avalonia.Base/Rendering/DirtyRects.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Rendering
         /// </remarks>
         public void Add(Rect rect)
         {
-            if (!rect.IsEmpty)
+            if (!rect.IsDefault)
             {
                 for (var i = 0; i < _rects.Count; ++i)
                 {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
index 6b1796e50b..c308312398 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
@@ -192,14 +192,14 @@ namespace Avalonia.Controls
                     
                     void OnLayoutUpdated(object sender, EventArgs e)
                     {
-                        if(!editingCheckBox.Bounds.IsEmpty)
+                        if(!editingCheckBox.Bounds.IsDefault)
                         {
                             editingCheckBox.LayoutUpdated -= OnLayoutUpdated;
                             ProcessPointerArgs();
                         }
                     }
 
-                    if(editingCheckBox.Bounds.IsEmpty)
+                    if(editingCheckBox.Bounds.IsDefault)
                     {
                         editingCheckBox.LayoutUpdated += OnLayoutUpdated;
                     }
diff --git a/src/Avalonia.Controls/NativeControlHost.cs b/src/Avalonia.Controls/NativeControlHost.cs
index bcf0866129..18dc1b1264 100644
--- a/src/Avalonia.Controls/NativeControlHost.cs
+++ b/src/Avalonia.Controls/NativeControlHost.cs
@@ -145,7 +145,7 @@ namespace Avalonia.Controls
 
             if (IsEffectivelyVisible && bounds.HasValue)
             {
-                if (bounds.Value.IsEmpty)
+                if (bounds.Value.IsDefault)
                     return false;
                 _attachment?.ShowInBounds(bounds.Value);
             }
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
index a80a60350e..62e5f37273 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
@@ -112,7 +112,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
                                    ?? screens.FirstOrDefault(s => s.Bounds.Intersects(parentGeometry))
                                    ?? screens.FirstOrDefault();
 
-                if (targetScreen != null && targetScreen.WorkingArea.IsEmpty)
+                if (targetScreen != null && targetScreen.WorkingArea.IsDefault)
                 {
                     return targetScreen.Bounds;
                 }
diff --git a/src/Avalonia.Controls/Repeater/ViewportManager.cs b/src/Avalonia.Controls/Repeater/ViewportManager.cs
index e24ed37f1e..10e3dd57a0 100644
--- a/src/Avalonia.Controls/Repeater/ViewportManager.cs
+++ b/src/Avalonia.Controls/Repeater/ViewportManager.cs
@@ -465,7 +465,7 @@ namespace Avalonia.Controls
 
             _pendingViewportShift = default;
             _unshiftableShift = default;
-            if (_visibleWindow.IsEmpty)
+            if (_visibleWindow.IsDefault)
             {
                 // We got cleared.
                 _layoutExtent = default;
@@ -551,7 +551,7 @@ namespace Avalonia.Controls
         private void TryInvalidateMeasure()
         {
             // Don't invalidate measure if we have an invalid window.
-            if (!_visibleWindow.IsEmpty)
+            if (!_visibleWindow.IsDefault)
             {
                 // We invalidate measure instead of just invalidating arrange because
                 // we don't invalidate measure in UpdateViewport if the view is changing to

From acfc66eeb196bf5008f56e7f08d70a6dbfde9443 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Thu, 1 Dec 2022 20:50:46 -0500
Subject: [PATCH 05/11] Add DirtyRects.IsEmpty comment

IsEmpty is allowed to stay here because it is an internal API. Empty also makes sense when working with collections.
---
 src/Avalonia.Base/Rendering/DirtyRects.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Avalonia.Base/Rendering/DirtyRects.cs b/src/Avalonia.Base/Rendering/DirtyRects.cs
index e4238f8308..723fe400b3 100644
--- a/src/Avalonia.Base/Rendering/DirtyRects.cs
+++ b/src/Avalonia.Base/Rendering/DirtyRects.cs
@@ -10,6 +10,9 @@ namespace Avalonia.Rendering
     {
         private List<Rect> _rects = new List<Rect>();
 
+        /// <summary>
+        /// Gets a value indicating whether the collection of dirty rectangles is empty.
+        /// </summary>
         public bool IsEmpty => _rects.Count == 0;
 
         /// <summary>

From 210390243f9f2b346ac168b4598465860f78b0c6 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Thu, 1 Dec 2022 20:54:21 -0500
Subject: [PATCH 06/11] Standardize IsDefault member in Thickness

---
 src/Avalonia.Base/Thickness.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Base/Thickness.cs b/src/Avalonia.Base/Thickness.cs
index da3a98088f..beaf85c9d3 100644
--- a/src/Avalonia.Base/Thickness.cs
+++ b/src/Avalonia.Base/Thickness.cs
@@ -97,10 +97,9 @@ namespace Avalonia
         /// </summary>
         public double Bottom => _bottom;
 
-        /// <summary>
-        /// Gets a value indicating whether all sides are set to 0.
-        /// </summary>
-        public bool IsEmpty => Left.Equals(0) && IsUniform;
+        /// <inheritdoc cref="IsDefault"/>
+        [Obsolete("Use IsDefault instead.")]
+        public bool IsEmpty => IsDefault;
 
         /// <summary>
         /// Gets a value indicating whether all sides are equal.
@@ -292,15 +291,13 @@ namespace Avalonia
             left = this._left;
             top = this._top;
             right = this._right;
-            bottom = this._bottom;        
+            bottom = this._bottom;
         }
 
         /// <summary>
-        /// Gets a value indicating whether the left, top, right and bottom thickness values are zero.
+        /// Gets a value indicating whether the instance has default values
+        /// (the left, top, right and bottom values are zero).
         /// </summary>
-        public bool IsDefault
-        {
-            get { return (_left == 0) && (_top == 0) && (_right == 0) && (_bottom == 0); }
-        }
+        public bool IsDefault => (_left == 0) && (_top == 0) && (_right == 0) && (_bottom == 0);
     }
 }

From 5a743ad4c85067a22ee3d0f03878364ec6c61bdc Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Sat, 3 Dec 2022 10:20:10 -0500
Subject: [PATCH 07/11] Standardize Default member in PixelRect

---
 samples/ControlCatalog/Pages/ImagePage.xaml.cs |  2 +-
 src/Avalonia.Base/PixelRect.cs                 | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ImagePage.xaml.cs b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
index 511b01c7ac..00878dc5a8 100644
--- a/samples/ControlCatalog/Pages/ImagePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
@@ -70,7 +70,7 @@ namespace ControlCatalog.Pages
                 3 => new PixelRect(new PixelPoint(bitmapWidth - cropSize.Width, 0), cropSize),
                 4 => new PixelRect(new PixelPoint(0, bitmapHeight - cropSize.Height), cropSize),
                 5 => new PixelRect(new PixelPoint(bitmapWidth - cropSize.Width, bitmapHeight - cropSize.Height), cropSize),
-                _ => PixelRect.Empty
+                _ => PixelRect.Default
             };
             
         }
diff --git a/src/Avalonia.Base/PixelRect.cs b/src/Avalonia.Base/PixelRect.cs
index 409a259182..330edbd872 100644
--- a/src/Avalonia.Base/PixelRect.cs
+++ b/src/Avalonia.Base/PixelRect.cs
@@ -10,9 +10,13 @@ namespace Avalonia
     public readonly struct PixelRect : IEquatable<PixelRect>
     {
         /// <summary>
-        /// An empty rectangle.
+        /// A shared default instance representing an empty rectangle.
         /// </summary>
-        public static readonly PixelRect Empty = default;
+        public static readonly PixelRect Default = default;
+
+        /// <inheritdoc cref="Default"/>
+        [Obsolete("Use Default instead.")]
+        public static readonly PixelRect Empty = Default;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PixelRect"/> structure.
@@ -261,7 +265,7 @@ namespace Avalonia
             }
             else
             {
-                return Empty;
+                return Default;
             }
         }
 

From 509ebddcc4fc8408aa5799367e2a40a1c1586c0f Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Sat, 3 Dec 2022 10:25:13 -0500
Subject: [PATCH 08/11] Standardize Default member in Rect

---
 src/Avalonia.Base/Media/Geometry.cs                  |  4 ++--
 src/Avalonia.Base/Media/GeometryDrawing.cs           |  2 +-
 src/Avalonia.Base/Media/GlyphRunDrawing.cs           |  2 +-
 .../Media/TextFormatting/TextLineImpl.cs             |  4 ++--
 src/Avalonia.Base/Rect.cs                            | 12 ++++++++----
 .../Server/ServerCompositionDrawListVisual.cs        |  2 +-
 .../Composition/Server/ServerCompositionTarget.cs    |  2 +-
 .../Composition/Server/ServerCompositionVisual.cs    |  2 +-
 src/Avalonia.Base/Rendering/ImmediateRenderer.cs     |  2 +-
 .../Rendering/SceneGraph/BitmapBlendModeNode.cs      |  2 +-
 src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs   |  2 +-
 .../Rendering/SceneGraph/GeometryClipNode.cs         |  2 +-
 .../Rendering/SceneGraph/OpacityMaskNode.cs          |  4 ++--
 .../Rendering/SceneGraph/OpacityNode.cs              |  2 +-
 .../Rendering/SceneGraph/SceneBuilder.cs             |  6 +++---
 .../Primitives/DataGridCellsPresenter.cs             |  2 +-
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs          |  2 +-
 .../HeadlessPlatformRenderInterface.cs               |  2 +-
 .../Avalonia.Browser/WebEmbeddableControlRoot.cs     |  2 +-
 src/Skia/Avalonia.Skia/GeometryImpl.cs               |  2 +-
 src/Skia/Avalonia.Skia/StreamGeometryImpl.cs         |  2 +-
 tests/Avalonia.Base.UnitTests/RectTests.cs           |  2 +-
 .../Rendering/DeferredRendererTests_HitTesting.cs    |  4 ++--
 .../Rendering/SceneGraph/DrawOperationTests.cs       |  4 ++--
 .../ItemsPresenterTests_Virtualization_Simple.cs     |  2 +-
 .../Shapes/RectangleTests.cs                         |  2 +-
 26 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/Avalonia.Base/Media/Geometry.cs b/src/Avalonia.Base/Media/Geometry.cs
index c31a6699c2..7d56140f22 100644
--- a/src/Avalonia.Base/Media/Geometry.cs
+++ b/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.Empty;
+        public Rect Bounds => PlatformImpl?.Bounds ?? Rect.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.Empty;
+        public Rect GetRenderBounds(IPen pen) => PlatformImpl?.GetRenderBounds(pen) ?? Rect.Default;
 
         /// <summary>
         /// Indicates whether the geometry's fill contains the specified point.
diff --git a/src/Avalonia.Base/Media/GeometryDrawing.cs b/src/Avalonia.Base/Media/GeometryDrawing.cs
index 7df7d25954..e9cbcecabe 100644
--- a/src/Avalonia.Base/Media/GeometryDrawing.cs
+++ b/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.Empty;
+			return Geometry?.GetRenderBounds(pen) ?? Rect.Default;
         }
     }
 }
diff --git a/src/Avalonia.Base/Media/GlyphRunDrawing.cs b/src/Avalonia.Base/Media/GlyphRunDrawing.cs
index 7e0d5c3c81..eab2d99387 100644
--- a/src/Avalonia.Base/Media/GlyphRunDrawing.cs
+++ b/src/Avalonia.Base/Media/GlyphRunDrawing.cs
@@ -32,7 +32,7 @@
 
         public override Rect GetBounds()
         {
-            return GlyphRun != null ? new Rect(GlyphRun.Size) : Rect.Empty;
+            return GlyphRun != null ? new Rect(GlyphRun.Size) : Rect.Default;
         }
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index 96f88d1f44..8f56e1d4c9 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -528,7 +528,7 @@ namespace Avalonia.Media.TextFormatting
 
             var startX = Start;
             double currentWidth = 0;
-            var currentRect = Rect.Empty;
+            var currentRect = Rect.Default;
 
             TextRunBounds lastRunBounds = default;
 
@@ -762,7 +762,7 @@ namespace Avalonia.Media.TextFormatting
 
             var startX = WidthIncludingTrailingWhitespace;
             double currentWidth = 0;
-            var currentRect = Rect.Empty;
+            var currentRect = Rect.Default;
 
             for (var index = TextRuns.Count - 1; index >= 0; index--)
             {
diff --git a/src/Avalonia.Base/Rect.cs b/src/Avalonia.Base/Rect.cs
index 862e4caec1..50b776d14f 100644
--- a/src/Avalonia.Base/Rect.cs
+++ b/src/Avalonia.Base/Rect.cs
@@ -16,9 +16,13 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// An empty rectangle.
+        /// A shared default instance representing an empty rectangle.
         /// </summary>
-        public static readonly Rect Empty = default(Rect);
+        public static readonly Rect Default = default;
+
+        /// <inheritdoc cref="Default"/>
+        [Obsolete("Use Default instead.")]
+        public static readonly Rect Empty = Default;
 
         /// <summary>
         /// The X position.
@@ -394,7 +398,7 @@ namespace Avalonia
             }
             else
             {
-                return Empty;
+                return Default;
             }
         }
 
@@ -467,7 +471,7 @@ namespace Avalonia
                 double.IsNaN(rect.X) || double.IsNaN(rect.Y) || 
                 double.IsNaN(Height) || double.IsNaN(Width))
             {
-                return Rect.Empty;
+                return Rect.Default;
             }
 
             if (rect.Width < 0)
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
index 6cbd2797f9..95ed8e27c1 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
@@ -37,7 +37,7 @@ internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisua
         {
             if (_contentBounds == null)
             {
-                var rect = Rect.Empty;
+                var rect = Rect.Default;
                 if(_renderCommands!=null)
                     foreach (var cmd in _renderCommands)
                         rect = rect.Union(cmd.Item.Bounds);
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
index c9517d01f8..c378f4981a 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -160,7 +160,7 @@ namespace Avalonia.Rendering.Composition.Server
                 }
                 RenderedVisuals = 0;
 
-                _dirtyRect = Rect.Empty;
+                _dirtyRect = Rect.Default;
             }
         }
 
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
index 5e6dcab209..e6943211e4 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
@@ -192,7 +192,7 @@ namespace Avalonia.Rendering.Composition.Server
 
         void AddDirtyRect(Rect rc)
         {
-            if(rc == Rect.Empty)
+            if(rc == Rect.Default)
                 return;
             Root?.AddDirtyRect(rc);
         }
diff --git a/src/Avalonia.Base/Rendering/ImmediateRenderer.cs b/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
index 9e1582ed43..98a224181c 100644
--- a/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
+++ b/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
@@ -127,7 +127,7 @@ namespace Avalonia.Rendering
         /// <inheritdoc/>
         public void AddDirty(Visual visual)
         {
-            if (visual.Bounds != Rect.Empty)
+            if (visual.Bounds != Rect.Default)
             {
                 var m = visual.TransformToVisual(_root);
 
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs
index 98e89f6549..6739e5b287 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public Rect Bounds => Rect.Empty;
+        public Rect Bounds => Rect.Default;
 
         /// <summary>
         /// Gets the BitmapBlend to be pushed or null if the operation represents a pop.
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs
index 90430bed02..9de18c068c 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs
@@ -40,7 +40,7 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public Rect Bounds => Rect.Empty;
+        public Rect Bounds => Rect.Default;
 
         /// <summary>
         /// Gets the clip to be pushed or null if the operation represents a pop.
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs
index 667b66420b..e8690ac6f8 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs
@@ -28,7 +28,7 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public Rect Bounds => Rect.Empty;
+        public Rect Bounds => Rect.Default;
 
         /// <summary>
         /// Gets the clip to be pushed or null if the operation represents a pop.
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
index 5fd200ddff..521fafe816 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
+++ b/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.Empty, Matrix.Identity, aux)
+            : base(Rect.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.Empty, Matrix.Identity, null)
+            : base(Rect.Default, Matrix.Identity, null)
         {
         }
 
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs
index 8fc630588f..af8b710191 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs
@@ -26,7 +26,7 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public Rect Bounds => Rect.Empty;
+        public Rect Bounds => Rect.Default;
 
         /// <summary>
         /// Gets the opacity to be pushed or null if the operation represents a pop.
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
index d54bd3fad8..863662c93f 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
@@ -331,8 +331,8 @@ namespace Avalonia.Rendering.SceneGraph
 
                 scene.Size = newSize;
 
-                Rect horizontalDirtyRect = Rect.Empty;
-                Rect verticalDirtyRect = Rect.Empty;
+                Rect horizontalDirtyRect = Rect.Default;
+                Rect verticalDirtyRect = Rect.Default;
 
                 if (newSize.Width > oldSize.Width)
                 {
@@ -429,7 +429,7 @@ namespace Avalonia.Rendering.SceneGraph
             else
             {
                 layer.OpacityMask = null;
-                layer.OpacityMaskRect = Rect.Empty;
+                layer.OpacityMaskRect = Rect.Default;
             }
 
             layer.GeometryClip = node.HasAncestorGeometryClip ?
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
index 38d559a031..0e552af2ba 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
@@ -161,7 +161,7 @@ namespace Avalonia.Controls.Primitives
                 {
                     // Clip
                     RectangleGeometry rg = new RectangleGeometry();
-                    rg.Rect = Rect.Empty;
+                    rg.Rect = Rect.Default;
                     cell.Clip = rg;
                 }
             }
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index 3ff248f0be..2fad480bba 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -457,7 +457,7 @@ namespace Avalonia.Controls.Primitives
                     PopupPositioning.PopupPositionerConstraintAdjustment.SlideY;
             }
 
-            var trgtBnds = Target?.Bounds ?? Rect.Empty;
+            var trgtBnds = Target?.Bounds ?? Rect.Default;
 
             switch (Placement)
             {
diff --git a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
index 7abc0ca131..c39f37aded 100644
--- a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
+++ b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
@@ -212,7 +212,7 @@ namespace Avalonia.Headless
 
         class HeadlessStreamingGeometryStub : HeadlessGeometryStub, IStreamGeometryImpl
         {
-            public HeadlessStreamingGeometryStub() : base(Rect.Empty)
+            public HeadlessStreamingGeometryStub() : base(Rect.Default)
             {
             }
 
diff --git a/src/Browser/Avalonia.Browser/WebEmbeddableControlRoot.cs b/src/Browser/Avalonia.Browser/WebEmbeddableControlRoot.cs
index e389ee98ea..8659b8f0d9 100644
--- a/src/Browser/Avalonia.Browser/WebEmbeddableControlRoot.cs
+++ b/src/Browser/Avalonia.Browser/WebEmbeddableControlRoot.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Browser
                 _onFirstRender = onFirstRender;
             }
 
-            public Rect Bounds => Rect.Empty;
+            public Rect Bounds => Rect.Default;
 
             public bool HasRendered => _hasRendered;
 
diff --git a/src/Skia/Avalonia.Skia/GeometryImpl.cs b/src/Skia/Avalonia.Skia/GeometryImpl.cs
index 4037cc4a35..6ff6354b4f 100644
--- a/src/Skia/Avalonia.Skia/GeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/GeometryImpl.cs
@@ -244,7 +244,7 @@ namespace Avalonia.Skia
             public void Invalidate()
             {
                 CachedStrokePath?.Dispose();
-                CachedGeometryRenderBounds = Rect.Empty;
+                CachedGeometryRenderBounds = Rect.Default;
                 _cachedStrokeWidth = default(float);
             }
         }
diff --git a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
index 86450690e6..6e0d42b478 100644
--- a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
+++ b/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.Empty)
+        public StreamGeometryImpl() : this(CreateEmptyPath(), Rect.Default)
         {
         }
         
diff --git a/tests/Avalonia.Base.UnitTests/RectTests.cs b/tests/Avalonia.Base.UnitTests/RectTests.cs
index 95a438b287..15265f1fcd 100644
--- a/tests/Avalonia.Base.UnitTests/RectTests.cs
+++ b/tests/Avalonia.Base.UnitTests/RectTests.cs
@@ -52,7 +52,7 @@ namespace Avalonia.Base.UnitTests
                 double.PositiveInfinity, double.PositiveInfinity)
                 .Normalize();
 
-            Assert.Equal(Rect.Empty, result);
+            Assert.Equal(Rect.Default, result);
         }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index 2cf42d9604..ce4fff77e9 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/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.Empty);
+                root.Renderer.Paint(Rect.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.Empty);
+                root.Renderer.Paint(Rect.Default);
                 result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
                 Assert.Equal(item2, result);
 
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
index 2fac968206..4a347762e1 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
+++ b/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.Empty, Matrix.Identity, null);
+            var target = new TestDrawOperation(Rect.Default, Matrix.Identity, null);
 
-            Assert.Equal(Rect.Empty, target.Bounds);
+            Assert.Equal(Rect.Default, target.Bounds);
         }
 
         [Theory]
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
index 08fd777ac6..d40f4f8cd0 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
+++ b/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.Empty);
+                target.Arrange(Rect.Default);
 
                 // Check for issue #591: this should not throw.
                 target.ScrollIntoView(0);
diff --git a/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs b/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs
index 8d8ce10d4c..6a6d3975a7 100644
--- a/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs
+++ b/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.Empty, geometry.Rect);
+            Assert.Equal(Rect.Default, geometry.Rect);
         }
 
         [Fact]

From a799f722420080991e9732bf2ac17378fbc7a327 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Mon, 5 Dec 2022 07:33:08 -0500
Subject: [PATCH 09/11] Remove PixelRect.Default

---
 samples/ControlCatalog/Pages/ImagePage.xaml.cs |  2 +-
 src/Avalonia.Base/PixelRect.cs                 | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ImagePage.xaml.cs b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
index 00878dc5a8..5b3169a1b0 100644
--- a/samples/ControlCatalog/Pages/ImagePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
@@ -70,7 +70,7 @@ namespace ControlCatalog.Pages
                 3 => new PixelRect(new PixelPoint(bitmapWidth - cropSize.Width, 0), cropSize),
                 4 => new PixelRect(new PixelPoint(0, bitmapHeight - cropSize.Height), cropSize),
                 5 => new PixelRect(new PixelPoint(bitmapWidth - cropSize.Width, bitmapHeight - cropSize.Height), cropSize),
-                _ => PixelRect.Default
+                _ => default
             };
             
         }
diff --git a/src/Avalonia.Base/PixelRect.cs b/src/Avalonia.Base/PixelRect.cs
index 330edbd872..469f33e7fd 100644
--- a/src/Avalonia.Base/PixelRect.cs
+++ b/src/Avalonia.Base/PixelRect.cs
@@ -10,13 +10,10 @@ namespace Avalonia
     public readonly struct PixelRect : IEquatable<PixelRect>
     {
         /// <summary>
-        /// A shared default instance representing an empty rectangle.
+        /// An empty rectangle.
         /// </summary>
-        public static readonly PixelRect Default = default;
-
-        /// <inheritdoc cref="Default"/>
-        [Obsolete("Use Default instead.")]
-        public static readonly PixelRect Empty = Default;
+        [Obsolete("Use the default keyword instead.")]
+        public static readonly PixelRect Empty = default;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PixelRect"/> structure.
@@ -265,7 +262,7 @@ namespace Avalonia
             }
             else
             {
-                return Default;
+                return default;
             }
         }
 

From 3fc6a51571d65dfcdeb21a20df1c9667b8c1164b Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Mon, 5 Dec 2022 07:43:51 -0500
Subject: [PATCH 10/11] Remove Rect.Default

---
 src/Avalonia.Base/Media/Geometry.cs                 |  4 ++--
 src/Avalonia.Base/Media/GeometryDrawing.cs          |  2 +-
 src/Avalonia.Base/Media/GlyphRunDrawing.cs          |  2 +-
 .../Media/TextFormatting/TextLineImpl.cs            |  4 ++--
 src/Avalonia.Base/Rect.cs                           | 13 +++++--------
 .../Server/ServerCompositionDrawListVisual.cs       |  2 +-
 .../Composition/Server/ServerCompositionTarget.cs   |  2 +-
 .../Composition/Server/ServerCompositionVisual.cs   |  2 +-
 src/Avalonia.Base/Rendering/ImmediateRenderer.cs    |  2 +-
 .../Rendering/SceneGraph/BitmapBlendModeNode.cs     |  2 +-
 src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs  |  2 +-
 .../Rendering/SceneGraph/GeometryClipNode.cs        |  2 +-
 .../Rendering/SceneGraph/OpacityMaskNode.cs         |  4 ++--
 .../Rendering/SceneGraph/OpacityNode.cs             |  2 +-
 .../Rendering/SceneGraph/SceneBuilder.cs            |  6 +++---
 .../Primitives/DataGridCellsPresenter.cs            |  2 +-
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs         |  2 +-
 .../HeadlessPlatformRenderInterface.cs              |  2 +-
 .../Avalonia.Browser/WebEmbeddableControlRoot.cs    |  2 +-
 src/Skia/Avalonia.Skia/GeometryImpl.cs              |  2 +-
 src/Skia/Avalonia.Skia/StreamGeometryImpl.cs        |  2 +-
 tests/Avalonia.Base.UnitTests/RectTests.cs          |  2 +-
 .../Rendering/DeferredRendererTests_HitTesting.cs   |  4 ++--
 .../Rendering/SceneGraph/DrawOperationTests.cs      |  4 ++--
 .../ItemsPresenterTests_Virtualization_Simple.cs    |  2 +-
 .../Shapes/RectangleTests.cs                        |  2 +-
 26 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/src/Avalonia.Base/Media/Geometry.cs b/src/Avalonia.Base/Media/Geometry.cs
index 7d56140f22..2019f54c70 100644
--- a/src/Avalonia.Base/Media/Geometry.cs
+++ b/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.
diff --git a/src/Avalonia.Base/Media/GeometryDrawing.cs b/src/Avalonia.Base/Media/GeometryDrawing.cs
index e9cbcecabe..26cc2c3cab 100644
--- a/src/Avalonia.Base/Media/GeometryDrawing.cs
+++ b/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;
         }
     }
 }
diff --git a/src/Avalonia.Base/Media/GlyphRunDrawing.cs b/src/Avalonia.Base/Media/GlyphRunDrawing.cs
index eab2d99387..242b9913fa 100644
--- a/src/Avalonia.Base/Media/GlyphRunDrawing.cs
+++ b/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;
         }
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index 8f56e1d4c9..5312807a00 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/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--)
             {
diff --git a/src/Avalonia.Base/Rect.cs b/src/Avalonia.Base/Rect.cs
index 50b776d14f..831ab28adc 100644
--- a/src/Avalonia.Base/Rect.cs
+++ b/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)
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
index 95ed8e27c1..8dc088fed1 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
+++ b/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);
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
index c378f4981a..f68994c812 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -160,7 +160,7 @@ namespace Avalonia.Rendering.Composition.Server
                 }
                 RenderedVisuals = 0;
 
-                _dirtyRect = Rect.Default;
+                _dirtyRect = default;
             }
         }
 
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
index e6943211e4..387998f8d6 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
+++ b/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);
         }
diff --git a/src/Avalonia.Base/Rendering/ImmediateRenderer.cs b/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
index 98a224181c..989d4eb4d7 100644
--- a/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
+++ b/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);
 
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs
index 6739e5b287..b1190a159b 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs
+++ b/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.
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs
index 9de18c068c..e1bfaa4aa3 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs
+++ b/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.
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs
index e8690ac6f8..842edf2bcb 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs
+++ b/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.
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
index 521fafe816..3ecc07fa54 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
+++ b/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)
         {
         }
 
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs
index af8b710191..e41e639067 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs
+++ b/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.
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
index 863662c93f..55ff772772 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
+++ b/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 ?
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
index 0e552af2ba..06a77f0894 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
+++ b/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;
                 }
             }
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index 2fad480bba..7f7600e877 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/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)
             {
diff --git a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
index c39f37aded..d95ce3fe85 100644
--- a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
+++ b/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)
             {
             }
 
diff --git a/src/Browser/Avalonia.Browser/WebEmbeddableControlRoot.cs b/src/Browser/Avalonia.Browser/WebEmbeddableControlRoot.cs
index 8659b8f0d9..df1a24fa0f 100644
--- a/src/Browser/Avalonia.Browser/WebEmbeddableControlRoot.cs
+++ b/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;
 
diff --git a/src/Skia/Avalonia.Skia/GeometryImpl.cs b/src/Skia/Avalonia.Skia/GeometryImpl.cs
index 6ff6354b4f..1141763097 100644
--- a/src/Skia/Avalonia.Skia/GeometryImpl.cs
+++ b/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);
             }
         }
diff --git a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
index 6e0d42b478..df847d2224 100644
--- a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
+++ b/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)
         {
         }
         
diff --git a/tests/Avalonia.Base.UnitTests/RectTests.cs b/tests/Avalonia.Base.UnitTests/RectTests.cs
index 15265f1fcd..c44b328ed5 100644
--- a/tests/Avalonia.Base.UnitTests/RectTests.cs
+++ b/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);
         }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index ce4fff77e9..c164012446 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/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);
 
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
index 4a347762e1..07d2d672ae 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
+++ b/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]
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
index d40f4f8cd0..a2aba84c34 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
+++ b/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);
diff --git a/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs b/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs
index 6a6d3975a7..067d709ae1 100644
--- a/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs
+++ b/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]

From 932d52dcf3151f8d5a248eac4b0001b93584f826 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Mon, 5 Dec 2022 07:52:00 -0500
Subject: [PATCH 11/11] Standardize Default members in Size

---
 src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs       |  2 +-
 .../Composition/Server/DrawingContextProxy.cs          |  2 +-
 src/Avalonia.Base/Rendering/DeferredRenderer.cs        |  2 +-
 src/Avalonia.Base/Rendering/ImmediateRenderer.cs       |  2 +-
 src/Avalonia.Base/Size.cs                              |  8 +++-----
 src/Avalonia.Controls.DataGrid/DataGrid.cs             |  4 ++--
 .../Primitives/DataGridColumnHeadersPresenter.cs       |  2 +-
 .../Primitives/DataGridDetailsPresenter.cs             |  2 +-
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs            |  2 +-
 src/Avalonia.Controls/LayoutTransformControl.cs        | 10 +++++-----
 src/Avalonia.Controls/Presenters/ItemsPresenter.cs     |  6 +++---
 src/Avalonia.Controls/Shapes/Shape.cs                  |  2 +-
 .../ItemsPresenterTests_Virtualization_Simple.cs       |  2 +-
 13 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs b/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs
index ac462aeb72..525a543b70 100644
--- a/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs
+++ b/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs
@@ -78,7 +78,7 @@ namespace Avalonia.Media.Imaging
             get
             {
                 if (Source is not IBitmap bmp)
-                    return Size.Empty;
+                    return default;
                 if (SourceRect.IsDefault)
                     return Source.Size;
                 return SourceRect.Size.ToSizeWithDpi(bmp.Dpi);
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
index 03859d241f..e6bbba6ec0 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
@@ -163,7 +163,7 @@ internal class CompositorDrawingContextProxy : IDrawingContextImpl, IDrawingCont
         public CompositionDrawList? VisualBrushDrawList { get; set; }
         public Size GetRenderTargetSize(IVisualBrush brush)
         {
-            return VisualBrushDrawList?.Size ?? Size.Empty;
+            return VisualBrushDrawList?.Size ?? default;
         }
 
         public void RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)
diff --git a/src/Avalonia.Base/Rendering/DeferredRenderer.cs b/src/Avalonia.Base/Rendering/DeferredRenderer.cs
index a70a9ccbdf..4ad7c11d6d 100644
--- a/src/Avalonia.Base/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Base/Rendering/DeferredRenderer.cs
@@ -277,7 +277,7 @@ namespace Avalonia.Rendering
         /// <inheritdoc/>
         Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
         {
-            return TryGetChildScene(_currentDraw)?.Size ?? Size.Empty;
+            return TryGetChildScene(_currentDraw)?.Size ?? default;
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Base/Rendering/ImmediateRenderer.cs b/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
index 989d4eb4d7..4e9e7a0615 100644
--- a/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
+++ b/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
@@ -189,7 +189,7 @@ namespace Avalonia.Rendering
         Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
         {
             (brush.Visual as IVisualBrushInitialize)?.EnsureInitialized();
-            return brush.Visual?.Bounds.Size ?? Size.Empty;
+            return brush.Visual?.Bounds.Size ?? default;
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Base/Size.cs b/src/Avalonia.Base/Size.cs
index 5f20206200..aec237afae 100644
--- a/src/Avalonia.Base/Size.cs
+++ b/src/Avalonia.Base/Size.cs
@@ -28,8 +28,9 @@ namespace Avalonia
         public static readonly Size Infinity = new Size(double.PositiveInfinity, double.PositiveInfinity);
 
         /// <summary>
-        /// A size representing zero
+        /// A size representing zero.
         /// </summary>
+        [Obsolete("Use the default keyword instead.")]
         public static readonly Size Empty = new Size(0, 0);
 
         /// <summary>
@@ -309,9 +310,6 @@ namespace Avalonia
         /// <summary>
         /// Gets a value indicating whether the Width and Height values are zero.
         /// </summary>
-        public bool IsDefault
-        {
-            get { return (_width == 0) && (_height == 0); }
-        }
+        public bool IsDefault => (_width == 0) && (_height == 0);
     }
 }
diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index 454678c64b..68799915dc 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -1124,7 +1124,7 @@ namespace Avalonia.Controls
                     EnsureColumnHeadersVisibility();
                     if (!newValueCols)
                     {
-                        _columnHeadersPresenter.Measure(Size.Empty);
+                        _columnHeadersPresenter.Measure(default(Size));
                     }
                     else
                     {
@@ -1165,7 +1165,7 @@ namespace Avalonia.Controls
                 _topLeftCornerHeader.IsVisible = newValueRows && newValueCols;
                 if (_topLeftCornerHeader.IsVisible)
                 {
-                    _topLeftCornerHeader.Measure(Size.Empty);
+                    _topLeftCornerHeader.Measure(default(Size));
                 }
             }
 
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
index b34f52f47d..f9b84793c6 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
@@ -305,7 +305,7 @@ namespace Avalonia.Controls.Primitives
             }
             if (!OwningGrid.AreColumnHeadersVisible)
             {
-                return Size.Empty;
+                return default;
             }
             double height = OwningGrid.ColumnHeaderHeight;
             bool autoSizeHeight;
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridDetailsPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridDetailsPresenter.cs
index 543485b311..07e7708003 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridDetailsPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridDetailsPresenter.cs
@@ -112,7 +112,7 @@ namespace Avalonia.Controls.Primitives
         {
             if (OwningGrid == null || Children.Count == 0)
             {
-                return Size.Empty;
+                return default;
             }
 
             double desiredWidth = OwningGrid.AreRowDetailsFrozen ?
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index 7f7600e877..8455495830 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -435,7 +435,7 @@ namespace Avalonia.Controls.Primitives
         {
             Size sz;
             // Popup.Child can't be null here, it was set in ShowAtCore.
-            if (Popup.Child!.DesiredSize == Size.Empty)
+            if (Popup.Child!.DesiredSize.IsDefault)
             {
                 // Popup may not have been shown yet. Measure content
                 sz = LayoutHelper.MeasureChild(Popup.Child, Size.Infinity, new Thickness());
diff --git a/src/Avalonia.Controls/LayoutTransformControl.cs b/src/Avalonia.Controls/LayoutTransformControl.cs
index 5668b79e81..766a712c88 100644
--- a/src/Avalonia.Controls/LayoutTransformControl.cs
+++ b/src/Avalonia.Controls/LayoutTransformControl.cs
@@ -91,7 +91,7 @@ namespace Avalonia.Controls
             arrangedsize = TransformRoot.Bounds.Size;
 
             // This is the first opportunity under Silverlight to find out the Child's true DesiredSize
-            if (IsSizeSmaller(finalSizeTransformed, arrangedsize) && (Size.Empty == _childActualSize))
+            if (IsSizeSmaller(finalSizeTransformed, arrangedsize) && _childActualSize.IsDefault)
             {
                 //// Unfortunately, all the work so far is invalid because the wrong DesiredSize was used
                 //// Make a note of the actual DesiredSize
@@ -102,7 +102,7 @@ namespace Avalonia.Controls
             else
             {
                 // Clear the "need to measure/arrange again" flag
-                _childActualSize = Size.Empty;
+                _childActualSize = default;
             }
 
             // Return result to perform the transformation
@@ -122,7 +122,7 @@ namespace Avalonia.Controls
             }
 
             Size measureSize;
-            if (_childActualSize == Size.Empty)
+            if (_childActualSize.IsDefault)
             {
                 // Determine the largest size after the transformation
                 measureSize = ComputeLargestTransformedSize(availableSize);
@@ -206,7 +206,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Actual DesiredSize of Child element (the value it returned from its MeasureOverride method).
         /// </summary>
-        private Size _childActualSize = Size.Empty;
+        private Size _childActualSize = default;
 
         /// <summary>
         /// RenderTransform/MatrixTransform applied to TransformRoot.
@@ -281,7 +281,7 @@ namespace Avalonia.Controls
         private Size ComputeLargestTransformedSize(Size arrangeBounds)
         {
             // Computed largest transformed size
-            Size computedSize = Size.Empty;
+            Size computedSize = default;
 
             // Detect infinite bounds and constrain the scenario
             bool infiniteWidth = double.IsInfinity(arrangeBounds.Width);
diff --git a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
index 924c4567f6..96c9b7b5d9 100644
--- a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
@@ -77,7 +77,7 @@ namespace Avalonia.Controls.Presenters
         }
 
         /// <inheritdoc/>
-        Size IScrollable.Extent => Virtualizer?.Extent ?? Size.Empty;
+        Size IScrollable.Extent => Virtualizer?.Extent ?? default;
 
         /// <inheritdoc/>
         Vector IScrollable.Offset
@@ -136,12 +136,12 @@ namespace Avalonia.Controls.Presenters
         /// <inheritdoc/>
         protected override Size MeasureOverride(Size availableSize)
         {
-            return Virtualizer?.MeasureOverride(availableSize) ?? Size.Empty;
+            return Virtualizer?.MeasureOverride(availableSize) ?? default;
         }
 
         protected override Size ArrangeOverride(Size finalSize)
         {
-            return Virtualizer?.ArrangeOverride(finalSize) ?? Size.Empty;
+            return Virtualizer?.ArrangeOverride(finalSize) ?? default;
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Controls/Shapes/Shape.cs b/src/Avalonia.Controls/Shapes/Shape.cs
index 1a7218ff2a..e2a13512a5 100644
--- a/src/Avalonia.Controls/Shapes/Shape.cs
+++ b/src/Avalonia.Controls/Shapes/Shape.cs
@@ -292,7 +292,7 @@ namespace Avalonia.Controls.Shapes
                 return finalSize;
             }
 
-            return Size.Empty;
+            return default;
         }
 
         internal static (Size size, Matrix transform) CalculateSizeAndTransform(Size availableSize, Rect shapeBounds, Stretch Stretch)
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
index a2aba84c34..2d1dad6be0 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
@@ -569,7 +569,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                 var target = CreateTarget(itemCount: 10);
                 var items = (IList<string>)target.Items;
                 target.ApplyTemplate();
-                target.Measure(Size.Empty);
+                target.Measure(default(Size));
                 target.Arrange(default);
 
                 // Check for issue #591: this should not throw.