From d6e5c017ba375809f1bada0e429a8783ca68deed Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Fri, 18 Jun 2021 16:07:14 +0800
Subject: [PATCH] Merge pull request #6092 from
 AvaloniaUI/fixes/adornerlayer-measure

Implement measure pass in AdornerLayer.
---
 .../Primitives/AdornerLayer.cs                | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index 9834bf3d3b..a397608aba 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Specialized;
 using System.Linq;
+using System.Resources;
 using Avalonia.Media;
 using Avalonia.Rendering;
 using Avalonia.Utilities;
@@ -45,10 +46,27 @@ namespace Avalonia.Controls.Primitives
                 ?.AdornerLayer;
         }
 
-        protected override Size ArrangeOverride(Size finalSize)
+        protected override Size MeasureOverride(Size availableSize)
         {
-            var parent = Parent;
+            foreach (var child in Children)
+            {
+                var info = child.GetValue(s_adornedElementInfoProperty);
+
+                if (info != null && info.Bounds.HasValue)
+                {
+                    child.Measure(info.Bounds.Value.Bounds.Size);
+                }
+                else
+                {
+                    child.Measure(availableSize);
+                }
+            }
 
+            return default;
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
             foreach (var child in Children)
             {
                 var info = child.GetValue(s_adornedElementInfoProperty);