Browse Source

Nit

pull/21306/head
Steven He 5 months ago
parent
commit
e11b5091e6
  1. 7
      src/Avalonia.Base/Rendering/Composition/CompositionHitTestRTree.cs
  2. 3
      src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs

7
src/Avalonia.Base/Rendering/Composition/CompositionHitTestRTree.cs

@ -8,7 +8,6 @@ namespace Avalonia.Rendering.Composition;
internal readonly struct CompositionHitTestCandidate(CompositionVisual visual, int order)
{
public CompositionVisual Visual { get; } = visual;
public int Order { get; } = order;
}
@ -23,8 +22,7 @@ internal sealed class CompositionHitTestRTree
public ulong Revision { get; private set; }
public bool IsCurrent(CompositionVisual root, ulong revision) =>
ReferenceEquals(_indexedRoot, root) && Revision == revision;
public bool IsCurrent(CompositionVisual root, ulong revision) => ReferenceEquals(_indexedRoot, root) && Revision == revision;
public void Rebuild(CompositionVisual? root, ulong revision)
{
@ -194,8 +192,7 @@ internal sealed class CompositionHitTestRTree
}
private static LtrbRect Union(LtrbRect left, LtrbRect right) =>
new(
Math.Min(left.Left, right.Left),
new(Math.Min(left.Left, right.Left),
Math.Min(left.Top, right.Top),
Math.Max(left.Right, right.Right),
Math.Max(left.Bottom, right.Bottom));

3
src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs

@ -110,8 +110,7 @@ namespace Avalonia.Rendering.Composition
_hitTestIndexDirty = false;
}
if (!TryGetOwnTransform(root, out var rootTransform) ||
!TryGetGlobalTransform(root, out var globalTransform))
if (!TryGetOwnTransform(root, out var rootTransform) || !TryGetGlobalTransform(root, out var globalTransform))
return false;
rootParentPoint = point.Transform(rootTransform);

Loading…
Cancel
Save