From d05bbc8a4d9c7700e33e0bd7b6a1da31a314f5c1 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 29 Oct 2021 21:52:46 -0400 Subject: [PATCH] fix(calendar): Fix CalendarDatePicker cannot be scrolled when re-opened (cherry picked from commit d161c919b361a6d34d384e40c93d51cee3d16f1f) --- src/Uno.UI/UI/Xaml/FrameworkElement.EffectiveViewport.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Uno.UI/UI/Xaml/FrameworkElement.EffectiveViewport.cs b/src/Uno.UI/UI/Xaml/FrameworkElement.EffectiveViewport.cs index 21ce058f456c..7c1d3ea0abf3 100644 --- a/src/Uno.UI/UI/Xaml/FrameworkElement.EffectiveViewport.cs +++ b/src/Uno.UI/UI/Xaml/FrameworkElement.EffectiveViewport.cs @@ -74,6 +74,13 @@ private void ReconfigureViewportPropagation(bool isInternal = false, IFrameworkE { if (IsLoaded && IsEffectiveViewportEnabled) { +#if CHECK_LAYOUTED + if (IsLoaded) + { + _isLayouted = true; + } +#endif + if (_parentViewportUpdatesSubscription == null) { TRACE_EFFECTIVE_VIEWPORT("Enabling effective viewport propagation.");