Browse Source

Implement HitTestTransformed

pull/11005/head
jankrib 3 years ago
parent
commit
8f7deb17ad
  1. 2
      src/Avalonia.Base/Rendering/SceneGraph/CustomDrawOperation.cs
  2. 15
      src/Avalonia.Base/Rendering/SceneGraph/DrawOperation.cs
  3. 2
      src/Avalonia.Base/Rendering/SceneGraph/EllipseNode.cs
  4. 2
      src/Avalonia.Base/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
  5. 2
      src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs
  6. 2
      src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
  7. 2
      src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs
  8. 2
      src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs
  9. 2
      src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
  10. 2
      src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs
  11. 2
      tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs

2
src/Avalonia.Base/Rendering/SceneGraph/CustomDrawOperation.cs

@ -13,7 +13,7 @@ namespace Avalonia.Rendering.SceneGraph
Custom = custom; Custom = custom;
} }
public override bool HitTest(Point p) => Custom.HitTest(p); public override bool HitTestTransformed(Point p) => Custom.HitTest(p);
public override void Render(IDrawingContextImpl context) public override void Render(IDrawingContextImpl context)
{ {

15
src/Avalonia.Base/Rendering/SceneGraph/DrawOperation.cs

@ -37,5 +37,20 @@ namespace Avalonia.Rendering.SceneGraph
} }
public Matrix Transform { get; } public Matrix Transform { get; }
public sealed override bool HitTest(Point p)
{
if (Transform.IsIdentity)
return HitTestTransformed(p);
if (!Transform.HasInverse)
return false;
var transformedPoint = Transform.Invert().Transform(p);
return HitTestTransformed(transformedPoint);
}
public abstract bool HitTestTransformed(Point p);
} }
} }

2
src/Avalonia.Base/Rendering/SceneGraph/EllipseNode.cs

@ -43,7 +43,7 @@ namespace Avalonia.Rendering.SceneGraph
public override void Render(IDrawingContextImpl context) => context.DrawEllipse(Brush, Pen, Rect); public override void Render(IDrawingContextImpl context) => context.DrawEllipse(Brush, Pen, Rect);
public override bool HitTest(Point p) public override bool HitTestTransformed(Point p)
{ {
var center = Rect.Center; var center = Rect.Center;

2
src/Avalonia.Base/Rendering/SceneGraph/ExperimentalAcrylicNode.cs

@ -65,6 +65,6 @@ namespace Avalonia.Rendering.SceneGraph
} }
/// <inheritdoc/> /// <inheritdoc/>
public override bool HitTest(Point p) => Rect.Rect.ContainsExclusive(p); public override bool HitTestTransformed(Point p) => Rect.Rect.ContainsExclusive(p);
} }
} }

2
src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs

@ -64,7 +64,7 @@ namespace Avalonia.Rendering.SceneGraph
} }
/// <inheritdoc/> /// <inheritdoc/>
public override bool HitTest(Point p) public override bool HitTestTransformed(Point p)
{ {
return (Brush != null && Geometry.FillContains(p)) || return (Brush != null && Geometry.FillContains(p)) ||
(Pen != null && Geometry.StrokeContains(Pen, p)); (Pen != null && Geometry.StrokeContains(Pen, p));

2
src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs

@ -53,7 +53,7 @@ namespace Avalonia.Rendering.SceneGraph
} }
/// <inheritdoc/> /// <inheritdoc/>
public override bool HitTest(Point p) => Bounds.ContainsExclusive(p); public override bool HitTestTransformed(Point p) => Bounds.ContainsExclusive(p);
public override void Dispose() public override void Dispose()
{ {

2
src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs

@ -94,7 +94,7 @@ namespace Avalonia.Rendering.SceneGraph
} }
/// <inheritdoc/> /// <inheritdoc/>
public override bool HitTest(Point p) => DestRect.ContainsExclusive(p); public override bool HitTestTransformed(Point p) => DestRect.ContainsExclusive(p);
public override void Dispose() public override void Dispose()
{ {

2
src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs

@ -66,7 +66,7 @@ namespace Avalonia.Rendering.SceneGraph
context.DrawLine(Pen, P1, P2); context.DrawLine(Pen, P1, P2);
} }
public override bool HitTest(Point p) public override bool HitTestTransformed(Point p)
{ {
var halfThickness = Pen.Thickness / 2; var halfThickness = Pen.Thickness / 2;
var minX = Math.Min(P1.X, P2.X) - halfThickness; var minX = Math.Min(P1.X, P2.X) - halfThickness;

2
src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs

@ -30,7 +30,7 @@ namespace Avalonia.Rendering.SceneGraph
/// <inheritdoc/> /// <inheritdoc/>
public override bool HitTest(Point p) => false; public override bool HitTestTransformed(Point p) => false;
/// <summary> /// <summary>
/// Determines if this draw operation equals another. /// Determines if this draw operation equals another.

2
src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs

@ -74,7 +74,7 @@ namespace Avalonia.Rendering.SceneGraph
public override void Render(IDrawingContextImpl context) => context.DrawRectangle(Brush, Pen, Rect, BoxShadows); public override void Render(IDrawingContextImpl context) => context.DrawRectangle(Brush, Pen, Rect, BoxShadows);
/// <inheritdoc/> /// <inheritdoc/>
public override bool HitTest(Point p) public override bool HitTestTransformed(Point p)
{ {
if (Brush != null) if (Brush != null)
{ {

2
tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs

@ -82,7 +82,7 @@ namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
} }
public override bool HitTest(Point p) => false; public override bool HitTestTransformed(Point p) => false;
public override void Render(IDrawingContextImpl context) { } public override void Render(IDrawingContextImpl context) { }
} }

Loading…
Cancel
Save