From 2b79880bdf5e52f1a8926a5d8f3a683e8f894a8e Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Fri, 20 Sep 2024 19:04:53 +0300 Subject: [PATCH] chore: Share SCP MeasureOverride logic --- .../Controls/ScrollContentPresenter/ScrollContentPresenter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.cs index b69b36f1683a..1b39a010bb99 100644 --- a/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.cs +++ b/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.cs @@ -171,7 +171,6 @@ bool ILayoutConstraints.IsHeightConstrained(View requester) => new Rect(default, RenderSize); #endif -#if UNO_HAS_MANAGED_SCROLL_PRESENTER || __WASM__ protected override Size MeasureOverride(Size availableSize) { if (Content is UIElement child) @@ -223,9 +222,10 @@ protected override Size MeasureOverride(Size availableSize) ); } - return new Size(0, 0); + return base.MeasureOverride(availableSize); } +#if UNO_HAS_MANAGED_SCROLL_PRESENTER || __WASM__ protected override Size ArrangeOverride(Size finalSize) { if (Content is UIElement child)