From ebe9d6b086c3da15678aea2408412df18ce520e7 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 14:29:30 +0200
Subject: [PATCH] Tidied up DropDownButton ControlTheme.

---
 .../Controls/DropDownButton.xaml               | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
index 3206cb8cb1..96fd575f4f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
@@ -57,26 +57,26 @@
                           Margin="0,0,10,0"
                           Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z"
                           HorizontalAlignment="Right"
-                          VerticalAlignment="Center" />
+                          VerticalAlignment="Center"
+                          Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"/>
               </Grid>
             </Border>
           </ControlTemplate>
         </Setter.Value>
       </Setter>
       
-      <!--  Normal State  -->
-      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
-        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
-      </Style>
-      
       <!--  PointerOver State  -->
       <Style Selector="^:pointerover /template/ Border#RootBorder">
         <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
         <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
       </Style>
-      
+
       <!--  Pressed State  -->
+      <Style Selector="^:pressed">
+        <Setter Property="RenderTransform" Value="scale(0.98)" />
+      </Style>
+
       <Style Selector="^:pressed /template/ Border#RootBorder">
         <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
@@ -92,10 +92,6 @@
       <Style Selector="^:disabled /template/ PathIcon#DropDownGlyph">
         <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
       </Style>
-
-      <Style Selector="^:pressed">
-        <Setter Property="RenderTransform" Value="scale(0.98)" />
-      </Style>
     </ControlTheme>
   
 </ResourceDictionary>