Fix: Fixed an issue where tags would sometimes display with the wrong…

… color (files-community#16603)
gave92 · Dec 17, 2024 · 6089e6f · 6089e6f
1 parent d12b6ba
commit 6089e6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Files.App.Controls/ThemedIcon/ThemedIcon.Properties.cs b/src/Files.App.Controls/ThemedIcon/ThemedIcon.Properties.cs
@@ -32,6 +32,7 @@ protected virtual void OnOutlineIconPropertyChanged(string oldValue, string newV
 		protected virtual void OnColorPropertyChanged(Brush oldValue, Brush newValue)
 		{
 			OnIconTypeChanged();
+			OnIconColorChanged();
 		}
 
 		protected virtual void OnIconTypePropertyChanged(ThemedIconTypes oldValue, ThemedIconTypes newValue)

diff --git a/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs b/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs
@@ -240,5 +240,14 @@ private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArg
 		{
 			UpdateVisualStates();
 		}
+
+		private void OnIconColorChanged()
+		{
+			if (GetTemplateChild(OutlineIconPath) is Path outlinePath)
+				outlinePath.Fill = (Brush)this.GetValue(ColorProperty);
+
+			if (GetTemplateChild(FilledIconPath) is Path fillPath)
+				fillPath.Fill = (Brush)this.GetValue(ColorProperty);
+		}
 	}
 }