diff --git a/src/Controls/src/Core/ContentPage/ContentPage.cs b/src/Controls/src/Core/ContentPage/ContentPage.cs
index 655da07dba69..31a171452f8f 100644
--- a/src/Controls/src/Core/ContentPage/ContentPage.cs
+++ b/src/Controls/src/Core/ContentPage/ContentPage.cs
@@ -70,8 +70,7 @@ internal override void OnControlTemplateChanged(ControlTemplate oldValue, Contro
protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
{
- DesiredSize = this.ComputeDesiredSize(widthConstraint, heightConstraint);
- return DesiredSize;
+ return this.ComputeDesiredSize(widthConstraint, heightConstraint);
}
protected override Size ArrangeOverride(Rect bounds)
diff --git a/src/Controls/src/Core/ContentPresenter.cs b/src/Controls/src/Core/ContentPresenter.cs
index b9b33fd1e3da..6816bd1ddff5 100644
--- a/src/Controls/src/Core/ContentPresenter.cs
+++ b/src/Controls/src/Core/ContentPresenter.cs
@@ -102,8 +102,7 @@ static async void OnContentChanged(BindableObject bindable, object oldValue, obj
protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
{
- DesiredSize = this.ComputeDesiredSize(widthConstraint, heightConstraint);
- return DesiredSize;
+ return this.ComputeDesiredSize(widthConstraint, heightConstraint);
}
Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
diff --git a/src/Controls/src/Core/Layout.cs b/src/Controls/src/Core/Layout.cs
index 4fd9646e8737..36624418c6bc 100644
--- a/src/Controls/src/Core/Layout.cs
+++ b/src/Controls/src/Core/Layout.cs
@@ -236,14 +236,14 @@ protected virtual void OnChildMeasureInvalidated()
Size IView.Measure(double widthConstraint, double heightConstraint)
{
- return MeasureOverride(widthConstraint, heightConstraint);
+ DesiredSize = MeasureOverride(widthConstraint, heightConstraint);
+ return DesiredSize;
}
protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
{
var sansMargins = OnMeasure(widthConstraint, heightConstraint).Request;
- DesiredSize = new Size(sansMargins.Width + Margin.HorizontalThickness, sansMargins.Height + Margin.VerticalThickness);
- return DesiredSize;
+ return new Size(sansMargins.Width + Margin.HorizontalThickness, sansMargins.Height + Margin.VerticalThickness);
}
protected override void OnSizeAllocated(double width, double height)
diff --git a/src/Controls/src/Core/ScrollView/ScrollView.cs b/src/Controls/src/Core/ScrollView/ScrollView.cs
index 163e6ed6eeed..7f184b822d11 100644
--- a/src/Controls/src/Core/ScrollView/ScrollView.cs
+++ b/src/Controls/src/Core/ScrollView/ScrollView.cs
@@ -441,8 +441,7 @@ void IScrollView.RequestScrollTo(double horizontalOffset, double verticalOffset,
protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
{
- DesiredSize = this.ComputeDesiredSize(widthConstraint, heightConstraint);
- return DesiredSize;
+ return this.ComputeDesiredSize(widthConstraint, heightConstraint);
}
Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
diff --git a/src/Controls/src/Core/Shapes/Shape.cs b/src/Controls/src/Core/Shapes/Shape.cs
index c071e514d7dc..e4fa57df0e85 100644
--- a/src/Controls/src/Core/Shapes/Shape.cs
+++ b/src/Controls/src/Core/Shapes/Shape.cs
@@ -430,7 +430,6 @@ protected override Size MeasureOverride(double widthConstraint, double heightCon
result.Height += StrokeThickness;
result.Width += StrokeThickness;
- DesiredSize = result;
return result;
}
diff --git a/src/Controls/src/Core/TemplatedView/TemplatedView.cs b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
index f449f92943cc..4f05c6524c23 100644
--- a/src/Controls/src/Core/TemplatedView/TemplatedView.cs
+++ b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
@@ -120,8 +120,7 @@ public virtual ControlTemplate ResolveControlTemplate()
protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
{
- DesiredSize = this.ComputeDesiredSize(widthConstraint, heightConstraint);
- return DesiredSize;
+ return this.ComputeDesiredSize(widthConstraint, heightConstraint);
}
Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
diff --git a/src/Controls/src/Core/VisualElement/VisualElement.cs b/src/Controls/src/Core/VisualElement/VisualElement.cs
index 3b86e02b0115..2fa3ea92eb8f 100644
--- a/src/Controls/src/Core/VisualElement/VisualElement.cs
+++ b/src/Controls/src/Core/VisualElement/VisualElement.cs
@@ -1847,7 +1847,8 @@ void IView.InvalidateArrange()
///
Size IView.Measure(double widthConstraint, double heightConstraint)
{
- return MeasureOverride(widthConstraint, heightConstraint);
+ DesiredSize = MeasureOverride(widthConstraint, heightConstraint);
+ return DesiredSize;
}
///
@@ -1859,8 +1860,7 @@ Size IView.Measure(double widthConstraint, double heightConstraint)
/// The requested size that an element wants in order to be displayed on the device.
protected virtual Size MeasureOverride(double widthConstraint, double heightConstraint)
{
- DesiredSize = this.ComputeDesiredSize(widthConstraint, heightConstraint);
- return DesiredSize;
+ return this.ComputeDesiredSize(widthConstraint, heightConstraint);
}
///