From c6b3440e70798ccee29d7a19bc8260388ed76b02 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 11 Jan 2017 14:55:09 +0100 Subject: [PATCH] Remove Rect.operator* It was wrong - use Rect.TransformToAABB instead. --- .../Presenters/ScrollContentPresenter.cs | 2 +- src/Avalonia.Visuals/Rect.cs | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs index d9f0260e39..c217290226 100644 --- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs +++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs @@ -133,7 +133,7 @@ namespace Avalonia.Controls.Presenters return false; } - var rect = targetRect * transform.Value; + var rect = targetRect.TransformToAABB(transform.Value); var offset = Offset; var result = false; diff --git a/src/Avalonia.Visuals/Rect.cs b/src/Avalonia.Visuals/Rect.cs index 10253ec829..0d6aadbcaa 100644 --- a/src/Avalonia.Visuals/Rect.cs +++ b/src/Avalonia.Visuals/Rect.cs @@ -183,7 +183,7 @@ namespace Avalonia } /// - /// Multiplies a rectangle by a vector. + /// Multiplies a rectangle by a scaling vector. /// /// The rectangle. /// The vector scale. @@ -197,17 +197,6 @@ namespace Avalonia rect.Height * scale.Y); } - /// - /// Transforms a rectangle by a matrix and returns the axis-aligned bounding box. - /// - /// The rectangle. - /// The matrix. - /// The axis-aligned bounding box. - public static Rect operator *(Rect rect, Matrix matrix) - { - return new Rect(rect.TopLeft * matrix, rect.BottomRight * matrix); - } - /// /// Divides a rectangle by a vector. ///