From 6e96334dfe05e29096ac901bb0e71bf63a91d82f Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 19 Jun 2021 13:33:44 -0400
Subject: [PATCH] Merge pull request #6105 from amwx/combobox_data

ComboBox: Let Data and Stretch be overridden
---
 src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index 2eee656dc6..60420f2f44 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -112,9 +112,7 @@
                 <Panel Height="12"
                        Width="12" />
                 <Path x:Name="DropDownGlyph"
-                      Stretch="Uniform"
-                      VerticalAlignment="Center"
-                      Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+                      VerticalAlignment="Center" />
               </Panel>
             </Viewbox>
             <Popup Name="PART_Popup"
@@ -160,6 +158,8 @@
 
   <Style Selector="ComboBox /template/ Path#DropDownGlyph">
     <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
+    <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+    <Setter Property="Stretch" Value="Uniform" />
   </Style>
 
   <!--  PointerOver State  -->