Simplified ThemedIcon infra

Author: 0x5bfa

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

@@ -0,0 +1,62 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using CommunityToolkit.WinUI.UI;
+using Microsoft.UI.Xaml.Controls.Primitives;
+
+namespace Files.App.Controls
+{
+	public partial class ThemedIcon
+	{
+		private bool _isOwnerToggled;
+		private bool _isOwnerEnabled;
+
+		private Control? ownerControl = null;
+		private ToggleButton? ownerToggleButton = null;
+
+		private void FindOwnerControlStates()
+		{
+			if (this.FindAscendant<ToggleButton>() is ToggleButton toggleButton)
+			{
+				ownerToggleButton = toggleButton;
+
+				// IsChecked/IsToggled change aware
+				ownerToggleButton.Checked += OwnerControl_IsCheckedChanged;
+				ownerToggleButton.Unchecked += OwnerControl_IsCheckedChanged;
+				_isOwnerToggled = ownerToggleButton.IsChecked is true;
+			}
+
+			if (this.FindAscendant<Control>() is Control control)
+			{
+				ownerControl = control;
+
+				// IsEnabled change aware
+				ownerControl.IsEnabledChanged += OwnerControl_IsEnabledChanged;
+				_isOwnerEnabled = ownerControl.IsEnabled;
+
+				UpdateVisualStates();
+			}
+		}
+
+		private void OwnerControl_IsCheckedChanged(object sender, RoutedEventArgs e)
+		{
+			if (ownerToggleButton is null)
+				return;
+
+			_isOwnerToggled = ownerToggleButton.IsChecked is true;
+			UpdateVisualStates();
+
+		}
+
+		private void OwnerControl_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
+		{
+			if (ownerControl is null)
+				return;
+
+			_isOwnerEnabled = ownerControl.IsEnabled;
+			UpdateVisualStates();
+		}
+	}
+}

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

@@ -234,61 +234,61 @@ public object Layers
 
 		protected virtual void OnFilledIconPropertyChanged(string oldValue, string newValue)
 		{
-			UpdateFilledIconPath();
+			OnFilledIconChanged();
 		}
 
 		protected virtual void OnOutlineIconPropertyChanged(string oldValue, string newValue)
 		{
-			UpdateOutlineIconPath();
+			OnOutlineIconChanged();
 		}
 
 		// Color changed events
 		protected virtual void OnColorPropertyChanged(Brush oldValue, Brush newValue)
 		{
-			UpdateIconTypeStates();
+			OnIconTypeChanged();
 		}
 
 		// Enum changed events
 
 		protected virtual void OnIconTypePropertyChanged(ThemedIconTypes oldValue, ThemedIconTypes newValue)
 		{
-			UpdateIconTypeStates();
+			OnIconTypeChanged();
 		}
 
 		protected virtual void OnIconColorTypePropertyChanged(ThemedIconColorType oldValue, ThemedIconColorType newValue)
 		{
-			UpdateIconColorTypeStates();
+			OnIconColorTypeChanged();
 		}
 
 		// Double changed events
 
 		protected virtual void OnIconSizePropertyChanged(double oldValue, double newValue)
 		{
-			IconSizePropertyChanged();
+			UpdateVisualStates();
 		}
 
 		// Boolean changed events
 
 		protected virtual void OnToggleBehaviorPropertyChanged(ToggleBehaviors oldValue, ToggleBehaviors newValue)
 		{
-			ToggleBehaviorChanged();
+			UpdateVisualStates();
 		}
 
 		protected virtual void OnIsFilledPropertyChanged(bool oldValue, bool newValue)
 		{
-			FilledChanged();
+			UpdateVisualStates();
 		}
 
 		protected virtual void OnIsHighContrastPropertyChanged(bool oldValue, bool newValue)
 		{
-			HighContrastChanged();
+			UpdateVisualStates();
 		}
 
 		// Object changed events
 
 		protected virtual void OnLayersPropertyChanged(object oldValue, object newValue)
 		{
-			UpdateLayeredIconContent();
+			OnLayeredIconChanged();
 		}
 
 		#endregion