From dae531f73f2762db4e55baaca430950a6eaab9d8 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Sun, 21 Mar 2021 19:32:28 -0500
Subject: [PATCH] Flyout presenter styles use CornerRadius property

---
 src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml   | 7 +++----
 .../Controls/MenuFlyoutPresenter.xaml                      | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
index 3a8df060fa..3c2547ba85 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
@@ -17,13 +17,15 @@
     <Setter Property="MaxHeight" Value="{DynamicResource FlyoutThemeMaxHeight}" />
     <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
     <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="LayoutRoot"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                Padding="{DynamicResource FlyoutBorderThemePadding}">
+                Padding="{DynamicResource FlyoutBorderThemePadding}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
             <ContentPresenter Content="{TemplateBinding Content}"
@@ -38,7 +40,4 @@
       </ControlTemplate>
     </Setter>
   </Style>
-  <Style Selector="FlyoutPresenter /template/ Border#LayoutRoot">
-    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-  </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
index 41a6e1cb65..ff50acab5e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
@@ -9,13 +9,15 @@
     <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
     <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
     <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="LayoutRoot"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                Padding="{DynamicResource FlyoutBorderThemePadding}">
+                Padding="{DynamicResource FlyoutBorderThemePadding}"
+                CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
             <ItemsPresenter Name="PART_ItemsPresenter"
@@ -30,7 +32,4 @@
       </ControlTemplate>
     </Setter>
   </Style>
-  <Style Selector="MenuFlyoutPresenter /template/ Border#LayoutRoot">
-    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-  </Style>
 </Styles>