Simplified ThemedIcon infra

Author: 0x5bfa

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

@@ -19,11 +19,10 @@ namespace Files.App.Controls
 	public partial class ThemedIcon : Control
 	{
 		private bool _ownerToggled;
-		private bool _isEnabled;
+		private bool _isOwnerEnabled;
 
-		private ToggleButton? ownerToggleButton = null;
-		private AppBarToggleButton? ownerAppBarToggleButton = null;
 		private Control? ownerControl = null;
+		private ToggleButton? ownerToggleButton = null;
 
 		public ThemedIcon()
 		{
@@ -40,7 +39,8 @@ protected override void OnApplyTemplate()
 			IsEnabledChanged += OnIsEnabledChanged;
 			SizeChanged += OnSizeChanged;
 
-			InitialIconStateValues();
+			_isOwnerEnabled = IsEnabled;
+
 			FindOwnerControlStates();
 			UpdateIconContent();
 			UpdateIconStates();
@@ -92,8 +92,8 @@ private void UpdateLayeredIconContent()
 						IconColorType = layer.IconColorType,
 						PathData = layer.PathData,
 						Opacity = layer.Opacity,
-						LayerColor = this.Color,
-						Foreground = this.Foreground,
+						LayerColor = Color,
+						Foreground = Foreground,
 						HorizontalAlignment = HorizontalAlignment.Stretch,
 						VerticalAlignment = VerticalAlignment.Stretch,
 						LayerSize = IconSize,
@@ -123,84 +123,49 @@ private void SetPathData(string partName, string pathData, FrameworkElement elem
 
 		private void FindOwnerControlStates()
 		{
-			/*
-			// Finds the owner Control and it's Checked and Enabled state
-
-			//
-			// Check if owner Control is a ToggleButton
-			// Hooks onto Event handlers when IsChecked and IsUnchecked runs
-			// Runs the ToggleChanged event, to set initial value, if the ToggleButton's isChecked is true
-			//
-			// Check if owner Control is an AppBarToggleButton
-			// Hooks onto Event handlers when IsChecked and IsUnchecked runs
-			// Runs the ToggleChanged event, to set initial value, if the AppBarToggleButton's isChecked is true
-			//
-			// Gets the owner Control
-			// Hooks onto Event handlers when IsEnabledChanged runs
-			// Runs the EnabledChanged event to set initial value
-			//
-			*/
-
-			ownerToggleButton = this.FindAscendant<ToggleButton>();
-
-			if (ownerToggleButton != null)
+			if (this.FindAscendant<ToggleButton>() is ToggleButton toggleButton)
 			{
+				ownerToggleButton = toggleButton;
+
+				// IsChecked/IsToggled change aware
 				ownerToggleButton.Checked += OwnerControl_IsCheckedChanged;
 				ownerToggleButton.Unchecked += OwnerControl_IsCheckedChanged;
-
-				UpdateOwnerToggle(ownerToggleButton.IsChecked is true);
+				_ownerToggled = ownerToggleButton.IsChecked is true;
 			}
 
-			ownerAppBarToggleButton = this.FindAscendant<AppBarToggleButton>();
-
-			if (ownerAppBarToggleButton != null)
+			if (this.FindAscendant<Control>() is Control control)
 			{
-				ownerAppBarToggleButton.Checked += OwnerControl_IsCheckedChanged;
-				ownerAppBarToggleButton.Unchecked += OwnerControl_IsCheckedChanged;
-
-				UpdateOwnerToggle(ownerAppBarToggleButton.IsChecked is true);
-			}
+				ownerControl = control;
 
-			ownerControl = this.FindAscendant<Control>();
-
-			if (ownerControl != null)
-			{
+				// IsEnabled change aware
 				ownerControl.IsEnabledChanged += OwnerControl_IsEnabledChanged;
+				_isOwnerEnabled = ownerControl.IsEnabled;
 
-				EnabledChanged(ownerControl.IsEnabled);
+				UpdateVisualStates();
 			}
 		}
 
 		private void OwnerControl_IsCheckedChanged(object sender, RoutedEventArgs e)
 		{
-			// Responds to owner checked changes
-			if (ownerToggleButton is null && ownerAppBarToggleButton is null)
+			if (ownerToggleButton is null)
 				return;
 
-			if (ownerToggleButton is not null)
-				UpdateOwnerToggle(ownerToggleButton.IsChecked is true);
-			else if (ownerAppBarToggleButton is not null)
-				UpdateOwnerToggle(ownerAppBarToggleButton.IsChecked is true);
+			_ownerToggled = ownerToggleButton.IsChecked is true;
+			UpdateVisualStates();
+
 		}
 
 		private void OwnerControl_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
 		{
-			// Responds to owner control enabled changes
 			if (ownerControl is null)
 				return;
 
-			EnabledChanged(ownerControl.IsEnabled);
-		}
-
-		private void ToggleBehaviorChanged()
-		{
+			_isOwnerEnabled = ownerControl.IsEnabled;
 			UpdateVisualStates();
 		}
 
-		private void UpdateOwnerToggle(bool isToggled)
+		private void ToggleBehaviorChanged()
 		{
-			_ownerToggled = isToggled;
-
 			UpdateVisualStates();
 		}
 
@@ -211,8 +176,7 @@ private void FilledChanged()
 
 		private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
 		{
-			// Handles for the derived control's IsEnabled property change
-			EnabledChanged((bool)e.NewValue);
+			UpdateVisualStates();
 		}
 
 		private void OnSizeChanged(object sender, SizeChangedEventArgs e)
@@ -225,28 +189,13 @@ private void IconSizePropertyChanged()
 			UpdateVisualStates();
 		}
 
-		private void EnabledChanged(bool value)
-		{
-			// Handles the IsEnabled property change
-			_isEnabled = value;
-
-			UpdateVisualStates();
-		}
-
 		private void HighContrastChanged()
 		{
 			UpdateVisualStates();
 		}
 
-		private void InitialIconStateValues()
-		{
-			_isEnabled = IsEnabled;
-		}
-
 		private void UpdateIconStates()
 		{
-			EnabledChanged(_isEnabled);
-
 			UpdateVisualStates();
 		}
 
@@ -268,22 +217,18 @@ private void UpdateIconTypeStates()
 					VisualStateManager.GoToState(this, FilledTypeStateName, true);
 					return;
 				}
-				else if (IsHighContrast is true || _isEnabled is false || IsEnabled is false)
+				else if (IsHighContrast is true || _isOwnerEnabled is false || IsEnabled is false)
 				{
 					VisualStateManager.GoToState(this, OutlineTypeStateName, true);
 					VisualStateManager.GoToState(this, DisabledStateName, true);
 					return;
 				}
 				else
 				{
-					if (IconType == ThemedIconTypes.Layered)
-					{
-						VisualStateManager.GoToState(this, LayeredTypeStateName, true);
-					}
-					else
-					{
-						VisualStateManager.GoToState(this, OutlineTypeStateName, true);
-					}
+					VisualStateManager.GoToState(
+						this,
+						IconType is ThemedIconTypes.Layered ? LayeredTypeStateName : OutlineTypeStateName,
+						true);
 				}
 			}
 			// If ToggleBehavior is On, we only go to Filled.
@@ -299,22 +244,18 @@ private void UpdateIconTypeStates()
 					VisualStateManager.GoToState(this, FilledTypeStateName, true);
 					return;
 				}
-				else if (IsHighContrast is true || _isEnabled is false || IsEnabled is false)
+				else if (IsHighContrast is true || _isOwnerEnabled is false || IsEnabled is false)
 				{
 					VisualStateManager.GoToState(this, OutlineTypeStateName, true);
 					VisualStateManager.GoToState(this, DisabledStateName, true);
 					return;
 				}
 				else
 				{
-					if (IconType == ThemedIconTypes.Layered)
-					{
-						VisualStateManager.GoToState(this, LayeredTypeStateName, true);
-					}
-					else
-					{
-						VisualStateManager.GoToState(this, OutlineTypeStateName, true);
-					}
+					VisualStateManager.GoToState(
+						this,
+						IconType is ThemedIconTypes.Layered ? LayeredTypeStateName : OutlineTypeStateName,
+						true);
 				}
 			}
 
@@ -326,7 +267,7 @@ private void UpdateIconColorTypeStates()
 			// Handles changes to the IconColorType and setting the correct Visual States.
 
 			// First we check the enabled state
-			if (_isEnabled is false || IsEnabled is false)
+			if (_isOwnerEnabled is false || IsEnabled is false)
 			{
 				// If ToggleBehavior is Auto and _ownerToggled is true
 				if (ToggleBehavior == ToggleBehaviors.Auto && _ownerToggled is true)