Fix issue with tint not applying to loaded images (#2077)

* Set image source if not matching element source, allow tint to apply if image loaded

* Remove check for image loaded which caused issue with ToggleImageSource button

* Add check back for IsLoaded, edit check for if image is not ready to be tinted

* Reset copying over TryGetButtonImage change

* Changed location of matching source check

* Add `OnIconTintColorBehaviorPropertyChanged`

* Update IconTintColorBehavior.windows.cs

---------

Co-authored-by: Shaun Lawrence <shaunrlawrence@gmail.com>
Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Co-authored-by: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>

Author: 3 people

src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/IconTintColor/IconTintColorBehavior.windows.cs

@@ -27,21 +27,8 @@ protected override void OnAttachedTo(View bindable, FrameworkElement platformVie
 
 		ApplyTintColor(platformView, bindable, TintColor);
 
+		PropertyChanged += OnIconTintColorBehaviorPropertyChanged;
 		bindable.PropertyChanged += OnElementPropertyChanged;
-		this.PropertyChanged += (s, e) =>
-		{
-			if (e.PropertyName == TintColorProperty.PropertyName)
-			{
-				if (currentColorBrush is not null && TintColor is not null)
-				{
-					currentColorBrush.Color = TintColor.ToWindowsColor();
-				}
-				else
-				{
-					ApplyTintColor(platformView, bindable, TintColor);
-				}
-			}
-		};
 	}
 
 	/// <inheritdoc/>
@@ -50,6 +37,8 @@ protected override void OnDetachedFrom(View bindable, FrameworkElement platformV
 		base.OnDetachedFrom(bindable, platformView);
 
 		bindable.PropertyChanged -= OnElementPropertyChanged;
+		PropertyChanged -= OnIconTintColorBehaviorPropertyChanged;
+
 		RemoveTintColor(platformView);
 	}
 
@@ -83,10 +72,34 @@ static bool TryGetSourceImageUri(WImage? imageControl, IImageElement? imageEleme
 		return false;
 	}
 
+	void OnIconTintColorBehaviorPropertyChanged(object? sender, PropertyChangedEventArgs e)
+	{
+		ArgumentNullException.ThrowIfNull(sender);
+		var iconTintColorBehavior = (IconTintColorBehavior)sender;
+
+		if (iconTintColorBehavior.View is not IView bindable
+			|| bindable.Handler?.PlatformView is not FrameworkElement platformView)
+		{
+			return;
+		}
+
+		if (e.PropertyName == TintColorProperty.PropertyName)
+		{
+			if (currentColorBrush is not null && TintColor is not null)
+			{
+				currentColorBrush.Color = TintColor.ToWindowsColor();
+			}
+			else
+			{
+				ApplyTintColor(platformView, bindable, TintColor);
+			}
+		}
+	}
+
 	void OnElementPropertyChanged(object? sender, PropertyChangedEventArgs e)
 	{
 		if (e.PropertyName is not string propertyName
-			|| sender is not View bindable
+			|| sender is not IView bindable
 			|| bindable.Handler?.PlatformView is not FrameworkElement platformView)
 		{
 			return;
@@ -99,7 +112,7 @@ void OnElementPropertyChanged(object? sender, PropertyChangedEventArgs e)
 		}
 	}
 
-	void ApplyTintColor(FrameworkElement platformView, View element, Color? color)
+	void ApplyTintColor(FrameworkElement platformView, IView element, Color? color)
 	{
 		RemoveTintColor(platformView);
 
@@ -128,7 +141,7 @@ void ApplyTintColor(FrameworkElement platformView, View element, Color? color)
 		}
 	}
 
-	void LoadAndApplyImageTintColor(View element, WImage image, Color color)
+	void LoadAndApplyImageTintColor(IView element, WImage image, Color color)
 	{
 		if (element is IImageElement { Source: UriImageSource uriImageSource })
 		{
@@ -140,6 +153,21 @@ void LoadAndApplyImageTintColor(View element, WImage image, Color color)
 
 			ApplyTintColor();
 		}
+		else if (image.IsLoaded)
+		{
+			// Sometimes WImage source doesn't match View source so the image is not ready to be tinted
+			// We must wait for next ImageOpened event
+			if (element is IImageElement { Source: FileImageSource fileImageSource }
+				&& image.Source is BitmapImage bitmapImage
+				&& Uri.Compare(new Uri($"{bitmapImage.UriSource.Scheme}:///{fileImageSource.File}"), bitmapImage.UriSource, UriComponents.Path, UriFormat.Unescaped, StringComparison.OrdinalIgnoreCase) is not 0)
+			{
+				image.ImageOpened += OnImageOpened;
+			}
+			else
+			{
+				ApplyTintColor();
+			}
+		}
 		else
 		{
 			image.ImageOpened += OnImageOpened;
@@ -178,7 +206,7 @@ void OnImageSizeChanged(object sender, SizeChangedEventArgs e)
 		}
 	}
 
-	void ApplyImageTintColor(View element, WImage image, Color color)
+	void ApplyImageTintColor(IView element, WImage image, Color color)
 	{
 		if (!TryGetSourceImageUri(image, (IImageElement)element, out var uri))
 		{