Browse Source

Merge pull request #911 from AvaloniaUI/remove-rect-multiply

Remove Rect.operator*
pull/914/head
Steven Kirk 10 years ago
committed by GitHub
parent
commit
3d8a258db3
  1. 2
      src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
  2. 13
      src/Avalonia.Visuals/Rect.cs

2
src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs

@ -133,7 +133,7 @@ namespace Avalonia.Controls.Presenters
return false; return false;
} }
var rect = targetRect * transform.Value; var rect = targetRect.TransformToAABB(transform.Value);
var offset = Offset; var offset = Offset;
var result = false; var result = false;

13
src/Avalonia.Visuals/Rect.cs

@ -183,7 +183,7 @@ namespace Avalonia
} }
/// <summary> /// <summary>
/// Multiplies a rectangle by a vector. /// Multiplies a rectangle by a scaling vector.
/// </summary> /// </summary>
/// <param name="rect">The rectangle.</param> /// <param name="rect">The rectangle.</param>
/// <param name="scale">The vector scale.</param> /// <param name="scale">The vector scale.</param>
@ -197,17 +197,6 @@ namespace Avalonia
rect.Height * scale.Y); rect.Height * scale.Y);
} }
/// <summary>
/// Transforms a rectangle by a matrix and returns the axis-aligned bounding box.
/// </summary>
/// <param name="rect">The rectangle.</param>
/// <param name="matrix">The matrix.</param>
/// <returns>The axis-aligned bounding box.</returns>
public static Rect operator *(Rect rect, Matrix matrix)
{
return new Rect(rect.TopLeft * matrix, rect.BottomRight * matrix);
}
/// <summary> /// <summary>
/// Divides a rectangle by a vector. /// Divides a rectangle by a vector.
/// </summary> /// </summary>

Loading…
Cancel
Save