From 6e31cb75248d2ab52de14c1be04eb831a8e7e6bc Mon Sep 17 00:00:00 2001 From: robloo Date: Thu, 16 Mar 2023 07:52:55 -0400 Subject: [PATCH] Fix more zero size checks using Rect --- .../Rendering/Composition/Server/ServerCompositionVisual.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs index 805852c834..6fb5ad3741 100644 --- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs +++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs @@ -149,7 +149,7 @@ namespace Avalonia.Rendering.Composition.Server if (ownBounds != _oldOwnContentBounds || positionChanged) { _oldOwnContentBounds = ownBounds; - if (ownBounds == default) + if (ownBounds.Width == 0 && ownBounds.Height == 0) TransformedOwnContentBounds = default; else TransformedOwnContentBounds = @@ -179,7 +179,7 @@ namespace Avalonia.Rendering.Composition.Server IsHitTestVisibleInFrame = _parent?.IsHitTestVisibleInFrame != false && Visible && !_isBackface - && _combinedTransformedClipBounds != default; + && (_combinedTransformedClipBounds.Width != 0 || _combinedTransformedClipBounds.Height != 0); IsVisibleInFrame = IsHitTestVisibleInFrame && _parent?.IsVisibleInFrame != false