fix: Properly apply template during measure after Loading

jeromelaban · May 31, 2024 · e8bfc59 · e8bfc59
1 parent 3c45797
commit e8bfc59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/Control/Control.cs b/src/Uno.UI/UI/Xaml/Controls/Control/Control.cs
@@ -225,10 +225,12 @@ private void OnTemplateChanged(DependencyPropertyChangedEventArgs e)
 		internal void SetUpdateControlTemplate(bool forceUpdate = false)
 		{
 			if (
-				!FeatureConfiguration.Control.UseLegacyLazyApplyTemplate
-				|| forceUpdate
-				|| this.HasParent()
-				|| CanCreateTemplateWithoutParent
+#if !UNO_HAS_ENHANCED_LIFECYCLE
+				!FeatureConfiguration.Control.UseLegacyLazyApplyTemplate ||
+#endif
+				forceUpdate ||
+				this.HasParent() ||
+				CanCreateTemplateWithoutParent
 			)
 			{
 				UpdateTemplate();

diff --git a/src/Uno.UI/UI/Xaml/FrameworkElement.Layout.crossruntime.cs b/src/Uno.UI/UI/Xaml/FrameworkElement.Layout.crossruntime.cs
@@ -196,7 +196,7 @@ private void InnerMeasureCore(Size availableSize)
 				// TODO: BEGIN Uno specific
 				if (this is Control thisAsControl)
 				{
-					thisAsControl.TryCallOnApplyTemplate();
+					thisAsControl.ApplyTemplate();
 
 					// Update bindings to ensure resources defined
 					// in visual parents get applied.