Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement measure pass in AdornerLayer. #6092

Merged
merged 2 commits into from
Jun 18, 2021
Merged

Implement measure pass in AdornerLayer. #6092

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b37ddad
Implement measure pass in AdornerLayer.
grokys Jun 17, 2021
faa3c11
Merge branch 'master' into fixes/adornerlayer-measure
MarchingCube Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/Avalonia.Controls/Primitives/AdornerLayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -45,10 +46,27 @@ public static AdornerLayer GetAdornerLayer(IVisual visual)
?.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);
Expand Down