Updated code as requested

Resolved requests from @marcelwgn

Author: mdtauk

src/Files.App.Controls/ThemedIcon/Data/ThemedIconToggleBehaviors.cs

@@ -9,17 +9,17 @@ namespace Files.App.Controls
 	public enum ToggleBehaviors
 	{
 		/// <summary>
-		/// Toggle Behavior type of <see cref="ThemedIcon"/> is Auto.
+		/// Auto enables the ThemedIcon to listen to owner control states.
 		/// </summary>
 		Auto,
 
 		/// <summary>
-		/// Toggle Behavior type of <see cref="ThemedIcon"/> is On.
+		/// On will always use the ThemedIcon's Toggle state
 		/// </summary>
 		On,
 
 		/// <summary>
-		/// Toggle Behavior type of <see cref="ThemedIcon"/> is Off.
+		/// Off will not use the ThemedIcon's Toggle state
 		/// </summary>
 		Off,
 	}

src/Files.App.Controls/ThemedIcon/ThemedIcon.cs

@@ -15,22 +15,27 @@ namespace Files.App.Controls
 	/// A control for a State and Color aware Icon
 	/// </summary>
 	public partial class ThemedIcon : Control
-	{
+	{		
+		private Viewbox?  _filledViewBox;
+		private Viewbox?  _outlineViewBox;
+		private Viewbox?  _layeredViewBox;
+		private Canvas?   _layeredCanvas;
+
 		public ThemedIcon()
 		{
 			DefaultStyleKey = typeof(ThemedIcon);
 		}
 
 		protected override void OnApplyTemplate()
 		{
-			IsEnabledChanged -= OnIsEnabledChanged;
-
 			base.OnApplyTemplate();
 
 			IsEnabledChanged += OnIsEnabledChanged;
 
 			_isOwnerEnabled = IsEnabled;
 
+			GetTemplateParts();
+
 			FindOwnerControlStates();
 			OnFilledIconChanged();
 			OnOutlineIconChanged();
@@ -40,39 +45,49 @@ protected override void OnApplyTemplate()
 			OnIconColorTypeChanged();
 		}
 
+		private void GetTemplateParts()
+		{
+			// Gets the template parts and sets the private fields
+			_outlineViewBox = GetTemplateChild( OutlinePathIconViewBox ) as Viewbox;
+			_filledViewBox  = GetTemplateChild( FilledPathIconViewBox ) as Viewbox;
+			_layeredViewBox = GetTemplateChild( LayeredPathIconViewBox ) as Viewbox;
+
+			_layeredCanvas = GetTemplateChild( LayeredPathCanvas ) as Canvas;
+		}
+
 		// Updates paths and layers
 
 		private void OnFilledIconChanged()
 		{
 			// Updates Filled Icon from Path Data
-			if (GetTemplateChild(FilledPathIconViewBox) is not Viewbox filledViewBox)
+			if (_filledViewBox == null)
 				return;
 
-			SetPathData(FilledIconPath, FilledIconData ?? string.Empty, filledViewBox);
+			SetPathData(FilledIconPath, FilledIconData ?? string.Empty, _filledViewBox );
 		}
 
 		private void OnOutlineIconChanged()
 		{
 			// Updates Outline Icon from Path Data
-			if (GetTemplateChild(OutlinePathIconViewBox) is not Viewbox outlineViewBox)
+			if (_outlineViewBox == null)
 				return;
 
-			SetPathData(OutlineIconPath, OutlineIconData ?? string.Empty, outlineViewBox);
+			SetPathData(OutlineIconPath, OutlineIconData ?? string.Empty, _outlineViewBox );
 		}
 
 		private void OnLayeredIconChanged()
 		{
 			// Updates Layered Icon from it's Layers
-			if (GetTemplateChild(LayeredPathIconViewBox) is not Viewbox layeredViewBox ||
-				GetTemplateChild(LayeredPathCanvas) is not Canvas canvas ||
-				Layers is not ICollection<ThemedIconLayer> layers)
-				return;
+			if ( _layeredViewBox == null ||
+				 _layeredCanvas == null ||
+				 Layers is not ICollection<ThemedIconLayer> layers)
+				 return;
 
-			canvas.Children.Clear();
+			_layeredCanvas.Children.Clear();
 
 			foreach (var layer in layers)
 			{
-				canvas.Children.Add(
+				_layeredCanvas.Children.Add(
 					new ThemedIconLayer()
 					{
 						LayerType = layer.LayerType,
@@ -180,8 +195,8 @@ private void OnIconColorTypeChanged()
 				}
 
 				// Update layered icon color
-				if (GetTemplateChild(LayeredPathCanvas) is Canvas canvas)
-					foreach (var layer in canvas.Children.Cast<ThemedIconLayer>())
+				if (_layeredCanvas != null)
+					foreach (var layer in _layeredCanvas.Children.Cast<ThemedIconLayer>())
 						layer.IconColorType = IconColorType;
 			}
 			else

src/Files.App.Controls/ThemedIcon/ThemedIconLayer/ThemedIconLayer.Consts.cs

@@ -32,8 +32,6 @@ namespace Files.App.Controls
     [TemplateVisualState(Name = CustomColorBGStateName, GroupName = IconLayerColorStateGroupName)]
 
 
-
-
     /// <summary>
     /// Displays a layer of <see cref="ThemedIcon"/> for <see cref="ThemedIconTypes.Layered"/> icon type.
     /// </summary>