From 4f7fdd31c20acc5d61ffb04e4ab2fa423707f82c Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 24 Aug 2020 14:34:39 +0100
Subject: [PATCH] fix expander as not easy to click on, and glyph not visible
 on fluent theme.

---
 src/Avalonia.Themes.Default/Expander.xaml | 2 +-
 src/Avalonia.Themes.Fluent/Expander.xaml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Expander.xaml b/src/Avalonia.Themes.Default/Expander.xaml
index d63f785e77..08d8b4c995 100644
--- a/src/Avalonia.Themes.Default/Expander.xaml
+++ b/src/Avalonia.Themes.Default/Expander.xaml
@@ -86,7 +86,7 @@
   <Style Selector="Expander /template/ ToggleButton#PART_toggle">
     <Setter Property="Template">
       <ControlTemplate>
-        <Border BorderThickness="1">
+        <Border BorderThickness="1" Background="Transparent">
           <Grid ColumnDefinitions="Auto,Auto">
             <Border Grid.Column="0" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center">
               <Path Fill="{DynamicResource ThemeForegroundBrush}"
diff --git a/src/Avalonia.Themes.Fluent/Expander.xaml b/src/Avalonia.Themes.Fluent/Expander.xaml
index e9eb939798..97ca62c493 100644
--- a/src/Avalonia.Themes.Fluent/Expander.xaml
+++ b/src/Avalonia.Themes.Fluent/Expander.xaml
@@ -86,10 +86,10 @@
   <Style Selector="Expander /template/ ToggleButton#PART_toggle">
     <Setter Property="Template">
       <ControlTemplate>
-        <Border BorderThickness="1">
+        <Border BorderThickness="1" Background="Transparent">
           <Grid ColumnDefinitions="Auto,Auto">
             <Border Grid.Column="0" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center">
-              <Path Fill="{DynamicResource SystemControlForegroundAltMediumHighBrush}"
+              <Path Fill="{DynamicResource SystemControlForegroundBaseHighBrush}"
                       HorizontalAlignment="Center"
                       VerticalAlignment="Center"
                       Data="M 0 2 L 4 6 L 0 10 Z" />