ViewHandler: Use the new flag to avoid setting tool tips unnecessarily

dotnet · Dec 10, 2024 · 2bb7162 · 2bb7162
1 parent dd94731
commit 2bb7162
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Core/src/Handlers/View/ViewHandler.cs b/src/Core/src/Handlers/View/ViewHandler.cs
@@ -530,7 +530,10 @@ public static void MapUnfocus(IViewHandler handler, IView view, object? args)
 		/// <param name="view">The associated <see cref="IView"/> instance.</param>
 		public static void MapToolTip(IViewHandler handler, IView view)
 		{
-#if PLATFORM
+#if WINDOWS
+			if (view is IToolTipElement tooltipContainer)
+				handler.ToPlatform().UpdateToolTip(tooltipContainer);
+#elif PLATFORM
 			if (view is IToolTipElement tooltipContainer)
 				handler.ToPlatform().UpdateToolTip(tooltipContainer.ToolTip);
 #endif

diff --git a/src/Core/src/Platform/Windows/ViewExtensions.cs b/src/Core/src/Platform/Windows/ViewExtensions.cs
@@ -326,6 +326,18 @@ public static async Task UpdateBackgroundImageSourceAsync(this FrameworkElement
 				await panel.UpdateBackgroundImageSourceAsync(imageSource, provider);
 		}
 
+		internal static void UpdateToolTip(this FrameworkElement platformView, IToolTipElement toolTipElement)
+		{
+			var content = toolTipElement.ToolTip?.Content;
+			var skipInitialization = (toolTipElement is IView view) && ((view.Handler as ElementHandler)?._isInitializing ?? false
+				|| content is not null);
+
+			if (!skipInitialization)
+			{
+				ToolTipService.SetToolTip(platformView, content);
+			}
+		}
+
 		public static void UpdateToolTip(this FrameworkElement platformView, ToolTip? tooltip)
 		{
 			ToolTipService.SetToolTip(platformView, tooltip?.Content);