Fixed pointer visual states updating issue

Author: 0x5bfa

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml

@@ -114,6 +114,7 @@
 
 							<VisualStateGroup x:Name="PointerStates">
 								<VisualState x:Name="PointerNormal" />
+
 								<VisualState x:Name="PointerOverItem">
 									<VisualState.Setters>
 										<Setter Target="PART_ItemButton.Background" Value="{ThemeResource ControlFillColorSecondaryBrush}" />
@@ -125,6 +126,7 @@
 										<Setter Target="PART_ChevronButton.Background" Value="{ThemeResource ControlFillColorSecondaryBrush}" />
 									</VisualState.Setters>
 								</VisualState>
+
 								<VisualState x:Name="PointerPressedOnItem">
 									<VisualState.Setters>
 										<Setter Target="PART_ItemButton.Background" Value="{ThemeResource ControlFillColorTertiaryBrush}" />
@@ -136,6 +138,7 @@
 										<Setter Target="PART_ChevronButton.Background" Value="{ThemeResource ControlFillColorTertiaryBrush}" />
 									</VisualState.Setters>
 								</VisualState>
+
 							</VisualStateGroup>
 
 							<VisualStateGroup x:Name="ItemTypeStates">

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarItem.cs

@@ -24,6 +24,11 @@ public sealed partial class BreadcrumbBarItem : ContentControl
 		private Border _itemButton = null!;
 		private Border _chevronButton = null!;
 
+		private bool _pointerOverItem;
+		private bool _pointerOverChevron;
+		private bool _pointerPressedOnItem;
+		private bool _pointerPressedOnChevron;
+
 		// Constructor
 
 		public BreadcrumbBarItem()
@@ -35,39 +40,113 @@ public BreadcrumbBarItem()
 
 		protected override void OnApplyTemplate()
 		{
+			base.OnApplyTemplate();
+
 			_itemButton = GetTemplateChild(_itemButtonName) as Border
 				?? throw new MissingFieldException($"Could not find {_itemButtonName} in the given {nameof(BreadcrumbBarItem)}'s style.");
 			_chevronButton = GetTemplateChild(_chevronButtonName) as Border
 				?? throw new MissingFieldException($"Could not find {_chevronButtonName} in the given {nameof(BreadcrumbBarItem)}'s style.");
 
-			_itemButton.PointerEntered += BreadcrumbBarItem_PointerEntered;
-			_itemButton.PointerPressed += BreadcrumbBarItem_PointerPressed;
-			_itemButton.PointerReleased += BreadcrumbBarItem_PointerReleased;
-			_itemButton.PointerExited += BreadcrumbBarItem_PointerExited;
+			_itemButton.PointerEntered += ItemButton_PointerEntered;
+			_itemButton.PointerPressed += ItemButton_PointerPressed;
+			_itemButton.PointerReleased += ItemButton_PointerReleased;
+			_itemButton.PointerExited += ItemButton_PointerExited;
 
-			base.OnApplyTemplate();
+			_chevronButton.PointerEntered += ChevronButton_PointerEntered;
+			_chevronButton.PointerPressed += ChevronButton_PointerPressed;
+			_chevronButton.PointerReleased += ChevronButton_PointerReleased;
+			_chevronButton.PointerExited += ChevronButton_PointerExited;
+
+			UpdateVisualStates();
+		}
+
+		private void UpdateVisualStates()
+		{
+			if (_pointerPressedOnItem || _pointerOverItem)
+			{
+				VisualStateManager.GoToState(
+					this,
+					_pointerPressedOnItem ? "PointerPressedOnItem" : _pointerOverItem ? "PointerOverItem" : "PointerNormal",
+					true);
+
+				return;
+			}
+
+			if (_pointerPressedOnChevron || _pointerOverChevron)
+			{
+				VisualStateManager.GoToState(
+					this,
+					_pointerPressedOnChevron ? "PointerPressedOnChevron" : _pointerOverChevron ? "PointerOverChevron" : "PointerNormal",
+					true);
+
+				return;
+			}
+
+			VisualStateManager.GoToState(this, "PointerNormal", true);
 		}
 
 		// Event methods
 
-		private void BreadcrumbBarItem_PointerEntered(object sender, PointerRoutedEventArgs e)
+		private void ItemButton_PointerEntered(object sender, PointerRoutedEventArgs e)
 		{
-			VisualStateManager.GoToState(this, "PointerOverItem", true);
+			_pointerOverItem = true;
+			_pointerPressedOnItem = false;
+
+			UpdateVisualStates();
 		}
 
-		private void BreadcrumbBarItem_PointerPressed(object sender, PointerRoutedEventArgs e)
+		private void ItemButton_PointerPressed(object sender, PointerRoutedEventArgs e)
 		{
-			VisualStateManager.GoToState(this, "PointerPressedOnItem", true);
+			_pointerOverItem = false;
+			_pointerPressedOnItem = true;
+
+			UpdateVisualStates();
 		}
 
-		private void BreadcrumbBarItem_PointerReleased(object sender, PointerRoutedEventArgs e)
+		private void ItemButton_PointerReleased(object sender, PointerRoutedEventArgs e)
 		{
-			VisualStateManager.GoToState(this, "PointerOverItem", true);
+			_pointerOverItem = true;
+			_pointerPressedOnItem = false;
+
+			UpdateVisualStates();
 		}
 
-		private void BreadcrumbBarItem_PointerExited(object sender, PointerRoutedEventArgs e)
+		private void ItemButton_PointerExited(object sender, PointerRoutedEventArgs e)
 		{
-			VisualStateManager.GoToState(this, "PointerNormal", true);
+			_pointerOverItem = _pointerPressedOnItem = false;
+
+			UpdateVisualStates();
+		}
+
+		private void ChevronButton_PointerEntered(object sender, PointerRoutedEventArgs e)
+		{
+			_pointerOverChevron = true;
+			_pointerPressedOnChevron = false;
+
+			UpdateVisualStates();
+		}
+
+		private void ChevronButton_PointerPressed(object sender, PointerRoutedEventArgs e)
+		{
+			_pointerOverChevron = false;
+			_pointerPressedOnChevron = true;
+
+			UpdateVisualStates();
+		}
+
+		private void ChevronButton_PointerReleased(object sender, PointerRoutedEventArgs e)
+		{
+			_pointerOverChevron = true;
+			_pointerPressedOnChevron = false;
+
+			UpdateVisualStates();
+		}
+
+		private void ChevronButton_PointerExited(object sender, PointerRoutedEventArgs e)
+		{
+			_pointerOverChevron = _pointerPressedOnChevron = false;
+
+			UpdateVisualStates();
 		}
 	}
 }