Skip to content

Fix measuring passes in AdornerLayer of the underlying Adorner elements #10657

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix measuring passes in AdornerLayer of the underlying Adorner elements #10657

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/AdornerLayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,12 +528,12 @@ internal void Add(Adorner adorner, int zOrder)
/// Clean all the dynamically-updated data from the Adorner
/// </summary>
/// <param name="adornerInfo">AdornerInfo to scrub</param>
internal void InvalidateAdorner(AdornerInfo adornerInfo)
internal static void InvalidateAdorner(AdornerInfo adornerInfo)
{
Debug.Assert(adornerInfo != null, "Adorner should not be null");
adornerInfo.Adorner.InvalidateMeasure();
adornerInfo.Adorner.InvalidateVisual();
adornerInfo.RenderSize = new Size(Double.NaN, Double.NaN);
adornerInfo.RenderSize = new Size(double.NaN, double.NaN);
adornerInfo.Transform = null;
}

Expand Down Expand Up @@ -742,13 +742,23 @@ private void UpdateElementAdorners(UIElement element)
transform.AffineTransform.Value != adornerInfo.Transform.AffineTransform.Value ||
clipChanged)
{
InvalidateAdorner(adornerInfo);
adornerInfo.Adorner.InvalidateMeasure();
adornerInfo.Adorner.InvalidateVisual();

adornerInfo.RenderSize = size;
adornerInfo.Transform = transform;

if (adornerInfo.Adorner.IsClipEnabled)
{
adornerInfo.Clip = clip;
}

dirty = true;
}
else if (adornerInfo.Adorner.ArrangeDirty)
{
adornerInfo.Adorner.InvalidateMeasure();

dirty = true;
}
}
Expand Down