TextBlockExtensions: Use the new flag in UpdatePadding

dotnet · Sep 30, 2024 · f6c8ab0 · f6c8ab0
1 parent fb287bc
commit f6c8ab0
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/Core/src/Platform/Windows/TextBlockExtensions.cs b/src/Core/src/Platform/Windows/TextBlockExtensions.cs
@@ -5,7 +5,6 @@
 using System.Xml.Linq;
 using System.Xml.Resolvers;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Documents;
 
 namespace Microsoft.Maui.Platform
 {
@@ -31,8 +30,18 @@ public static void UpdateText(this TextBlock platformControl, ILabel label)
 		public static void UpdateTextColor(this TextBlock platformControl, ITextStyle text) =>
 			platformControl.UpdateProperty(TextBlock.ForegroundProperty, text.TextColor);
 
-		public static void UpdatePadding(this TextBlock platformControl, ILabel label) =>
-			platformControl.UpdateProperty(TextBlock.PaddingProperty, label.Padding.ToPlatform());
+        public static void UpdatePadding(this TextBlock platformControl, ILabel label)
+        {
+			var padding = label.Padding;
+
+            bool? skipInitialization = (label.Handler as ElementHandler)?._isInitializing ?? false
+                || padding != Thickness.Zero;
+
+            if (skipInitialization != true)
+            {
+                platformControl.UpdateProperty(TextBlock.PaddingProperty, padding.ToPlatform());
+            }
+        }
 
 		public static void UpdateCharacterSpacing(this TextBlock platformControl, ITextStyle label)
 		{