From d60b5432beac82718616c81cffb1003bfa668ec4 Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Wed, 9 Sep 2026 10:43:14 +0000
Subject: [PATCH] fluent 2 - fix listbox resource item names

---
 .../Accents/FluentControlResources.xaml          |  4 ++++
 .../Controls/ListBoxItem.xaml                    | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent2/Accents/FluentControlResources.xaml b/src/Avalonia.Themes.Fluent2/Accents/FluentControlResources.xaml
index e9bf878d81..55dac7d371 100644
--- a/src/Avalonia.Themes.Fluent2/Accents/FluentControlResources.xaml
+++ b/src/Avalonia.Themes.Fluent2/Accents/FluentControlResources.xaml
@@ -184,6 +184,8 @@
       <StaticResource x:Key="ListBoxItemBackgroundSelected" ResourceKey="SystemControlHighlightListAccentLowBrush" />
       <StaticResource x:Key="ListBoxItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
       <StaticResource x:Key="ListBoxItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+      <StaticResource x:Key="ListViewItemSelectionIndicatorBrush" ResourceKey="AccentFillColorDefaultBrush" />
+      <StaticResource x:Key="ListViewItemSelectionIndicatorDisabledBrush" ResourceKey="AccentFillColorDisabledBrush" />
 
       <!-- Resources for ProgressBar.xaml -->
       <x:Double x:Key="ProgressBarThemeMinHeight">3</x:Double>
@@ -893,6 +895,8 @@
       <StaticResource x:Key="ListBoxItemBackgroundSelected" ResourceKey="SystemControlHighlightListAccentLowBrush" />
       <StaticResource x:Key="ListBoxItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
       <StaticResource x:Key="ListBoxItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+      <StaticResource x:Key="ListViewItemSelectionIndicatorBrush" ResourceKey="AccentFillColorDefaultBrush" />
+      <StaticResource x:Key="ListViewItemSelectionIndicatorDisabledBrush" ResourceKey="AccentFillColorDisabledBrush" />
 
       <!-- Resources for ProgressBar.xaml -->
       <x:Double x:Key="ProgressBarThemeMinHeight">3</x:Double>
diff --git a/src/Avalonia.Themes.Fluent2/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Fluent2/Controls/ListBoxItem.xaml
index 6de14c8e92..7f2105cdea 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/ListBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ListBoxItem.xaml
@@ -64,7 +64,7 @@
                      IsHitTestVisible="False"
                      UseLayoutRounding="False"
                      RenderTransform="scaleY(0)"
-                     Fill="{DynamicResource AccentFillColorDefaultBrush}">
+                     Fill="{DynamicResource ListViewItemSelectionIndicatorBrush}">
             <Rectangle.Transitions>
               <Transitions>
                 <TransformOperationsTransition Property="RenderTransform" Duration="{StaticResource ControlFastAnimationDuration}" Easing="0,0 0,1" />
@@ -81,13 +81,13 @@
 
     <!--  PointerOver State  -->
     <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}" />
+      <Setter Property="Background" Value="{DynamicResource ListBoxItemBackgroundPointerOver}" />
       <Setter Property="Foreground" Value="{DynamicResource ListBoxItemForeground}" />
     </Style>
 
     <!--  Pressed State  -->
     <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}" />
+      <Setter Property="Background" Value="{DynamicResource ListBoxItemBackgroundPressed}" />
       <Setter Property="Foreground" Value="{DynamicResource ListBoxItemForeground}" />
     </Style>
 
@@ -95,7 +95,7 @@
     <Style Selector="^:selected">
 
       <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}" />
+        <Setter Property="Background" Value="{DynamicResource ListBoxItemBackgroundPointerOver}" />
         <Setter Property="Foreground" Value="{DynamicResource ListBoxItemForeground}" />
       </Style>
 
@@ -105,24 +105,24 @@
       </Style>
 
       <Style Selector="^:disabled /template/ Rectangle#SelectionIndicator">
-        <Setter Property="Fill" Value="{DynamicResource AccentFillColorDisabledBrush}" />
+        <Setter Property="Fill" Value="{DynamicResource ListViewItemSelectionIndicatorDisabledBrush}" />
       </Style>
 
       <!--  Selected Unfocused State  -->
       <Style Selector="^:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}" />
+        <Setter Property="Background" Value="{DynamicResource ListBoxItemBackgroundPointerOver}" />
         <Setter Property="Foreground" Value="{DynamicResource ListBoxItemForeground}" />
       </Style>
 
       <!--  Selected PointerOver State  -->
       <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}" />
+        <Setter Property="Background" Value="{DynamicResource ListBoxItemBackgroundPressed}" />
         <Setter Property="Foreground" Value="{DynamicResource ListBoxItemForeground}" />
       </Style>
 
       <!--  Selected Pressed State  -->
       <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}" />
+        <Setter Property="Background" Value="{DynamicResource ListBoxItemBackgroundPointerOver}" />
         <Setter Property="Foreground" Value="{DynamicResource ListBoxItemForeground}" />
       </Style>
     </Style>