Merge branch 'mdta-ThemedIcon-ToggleFix' of https://github.com/mdtauk/Files into mdta-ThemedIcon-ToggleFix

Author: mdtauk

src/Files.App.Controls/ThemedIcon/ThemedIconColorType.cs renamed to src/Files.App.Controls/ThemedIcon/Data/ThemedIconColorType.cs

@@ -0,0 +1,26 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.Controls
+{
+	/// <summary>
+	/// Defines IconTypes for <see cref="ThemedIcon"/>.
+	/// </summary>
+	public enum ToggleBehaviors
+	{
+		/// <summary>
+		/// Toggle Behavior type of <see cref="ThemedIcon"/> is Auto.
+		/// </summary>
+		Auto,
+
+		/// <summary>
+		/// Toggle Behavior type of <see cref="ThemedIcon"/> is On.
+		/// </summary>
+		On,
+
+		/// <summary>
+		/// Toggle Behavior type of <see cref="ThemedIcon"/> is Off.
+		/// </summary>
+		Off,
+	}
+}

src/Files.App.Controls/ThemedIcon/Data/ThemedIconToggleBehaviors.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/ThemedIconTypes.cs renamed to src/Files.App.Controls/ThemedIcon/Data/ThemedIconTypes.cs

@@ -95,39 +95,14 @@ private void OnLayeredIconChanged()
 
 		private void OnIconTypeChanged()
 		{
-			// Handles changes to the IconType and setting the correct Visual States.
-
-			// If ToggleBehavior is Auto, we check for _ownerToggle
-			if (ToggleBehavior == ToggleBehaviors.Auto)
+			if (ToggleBehavior is ToggleBehaviors.Auto or ToggleBehaviors.Off)
 			{
-				if (_isOwnerToggled is true || IsFilled is true)
+				if (ToggleBehavior is ToggleBehaviors.Auto && (_isOwnerToggled is true || IsFilled is true))
 				{
 					VisualStateManager.GoToState(this, FilledTypeStateName, true);
 					return;
 				}
-				else if (IsHighContrast is true || _isOwnerEnabled is false || IsEnabled is false)
-				{
-					VisualStateManager.GoToState(this, OutlineTypeStateName, true);
-					VisualStateManager.GoToState(this, DisabledStateName, true);
-					return;
-				}
-				else
-				{
-					VisualStateManager.GoToState(
-						this,
-						IconType is ThemedIconTypes.Layered ? LayeredTypeStateName : OutlineTypeStateName,
-						true);
-				}
-			}
-			// If ToggleBehavior is On, we only go to Filled.
-			else if (ToggleBehavior == ToggleBehaviors.On)
-			{
-				VisualStateManager.GoToState(this, FilledTypeStateName, true);
-			}
-			// For Off, we don't respond to _ownerToggle at all
-			else
-			{
-				if (IsFilled is true)
+				if (ToggleBehavior is ToggleBehaviors.Off && IsFilled is true)
 				{
 					VisualStateManager.GoToState(this, FilledTypeStateName, true);
 					return;
@@ -146,49 +121,27 @@ private void OnIconTypeChanged()
 						true);
 				}
 			}
+			else if (ToggleBehavior is ToggleBehaviors.On)
+			{
+				VisualStateManager.GoToState(this, FilledTypeStateName, true);
+			}
 
 			VisualStateManager.GoToState(this, EnabledStateName, true);
 		}
 
 		private void OnIconColorTypeChanged()
 		{
-			// Handles changes to the IconColorType and setting the correct Visual States.
-
-			// First we check the enabled state
-			if (_isOwnerEnabled is false || IsEnabled is false)
+			if (_isOwnerEnabled || IsEnabled)
 			{
-				// If ToggleBehavior is Auto and _ownerToggled is true
-				if (ToggleBehavior == ToggleBehaviors.Auto && _isOwnerToggled is true)
-				{
-					VisualStateManager.GoToState(this, DisabledToggleColorStateName, true);
-				}
-				// If ToggleBehavior is On
-				else if (ToggleBehavior == ToggleBehaviors.On)
-				{
-					VisualStateManager.GoToState(this, DisabledToggleColorStateName, true);
-				}
-				// everything else uses Disabled Color
-				else
-				{
-					VisualStateManager.GoToState(this, DisabledColorStateName, true);
-				}
-			}
-			// Everything else is Enabled
-			else
-			{
-				// If ToggleBehavior is Auto and _ownerToggled is true
-				if (ToggleBehavior == ToggleBehaviors.Auto && _isOwnerToggled is true)
-				{
-					VisualStateManager.GoToState(this, ToggleStateName, true);
-				}
-				// If ToggleBehavior is On
-				else if (ToggleBehavior == ToggleBehaviors.On)
+				if ((ToggleBehavior is ToggleBehaviors.Auto && _isOwnerToggled) ||
+					ToggleBehavior is ToggleBehaviors.On)
 				{
+					// Toggle
 					VisualStateManager.GoToState(this, ToggleStateName, true);
 				}
-				// everything else uses the appropriate color state
 				else
 				{
+					// Use colorful ones
 					VisualStateManager.GoToState(
 						this,
 						IconColorType switch
@@ -204,11 +157,20 @@ private void OnIconColorTypeChanged()
 						true);
 				}
 
+				// Update layered icon color
 				if (GetTemplateChild(LayeredPathCanvas) is Canvas canvas)
-				{
 					foreach (var layer in canvas.Children.Cast<ThemedIconLayer>())
 						layer.IconColorType = IconColorType;
-				}
+			}
+			else
+			{
+				// Disable + toggle
+				if ((ToggleBehavior is ToggleBehaviors.Auto && _isOwnerToggled is true) ||
+					ToggleBehavior is ToggleBehaviors.On)
+					VisualStateManager.GoToState(this, DisabledToggleColorStateName, true);
+				// Disable
+				else
+					VisualStateManager.GoToState(this, DisabledColorStateName, true);
 			}
 		}