From a9925f928c7cfd817b1aac542a2242e0e6fa5238 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 11 Jul 2022 23:11:44 +0200
Subject: [PATCH] Make Separator look correct.

Previously there was a `MenuItem > Separator` selector, but I don't really see any reason to just apply this style directly to `Separator` itself. It's mainly used in menus and if one wants to use it elsewhere then they'd need to set these properties anyway.
---
 src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml  | 5 ++---
 src/Avalonia.Themes.Fluent/Controls/Separator.xaml | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index 8f77d1bc1b..ed29addbc2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -26,6 +26,7 @@
           <MenuItem Header="Child 1"/>
           <MenuItem Header="Child 2"/>
           <MenuItem Header="Child 3"/>
+          <Separator/>
           <MenuItem Header="Child 4"/>
           <MenuItem Header="Child 5"/>
           <MenuItem Header="Child 6"/>
@@ -204,9 +205,7 @@
     <Style Selector="^:separator">
       <Setter Property="Template">
         <ControlTemplate>
-          <Separator Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
-                     Margin="{DynamicResource MenuFlyoutSeparatorThemePadding}"
-                     Height="{DynamicResource MenuFlyoutSeparatorThemeHeight}"/>
+          <Separator/>
         </ControlTemplate>
       </Setter>
     </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Separator.xaml b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
index afbc3770c1..d13bffe5e1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
@@ -1,7 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <ControlTheme x:Key="{x:Type Separator}" TargetType="Separator">
+    <Setter Property="Background" Value="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
     <Setter Property="Focusable" Value="False" />
+    <Setter Property="Height" Value="{DynamicResource MenuFlyoutSeparatorThemeHeight}" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Margin" Value="{DynamicResource MenuFlyoutSeparatorThemePadding}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Padding="{TemplateBinding Margin}"