From 1d9ec1d07afb2b1609a3222d23c9206196483edb Mon Sep 17 00:00:00 2001
From: Yimeng Wu <me@kinnara.cn>
Date: Mon, 11 Jul 2022 00:47:52 +0800
Subject: [PATCH] Port microsoft/microsoft-ui-xaml#3936

---
 ModernWpf.Controls/Flyout/FlyoutPresenter.xaml | 5 ++---
 ModernWpf/ControlsResources.xaml               | 3 ++-
 ModernWpf/ThemeResources/Dark.xaml             | 2 +-
 ModernWpf/ThemeResources/HighContrast.xaml     | 6 +++---
 ModernWpf/ThemeResources/Light.xaml            | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ModernWpf.Controls/Flyout/FlyoutPresenter.xaml b/ModernWpf.Controls/Flyout/FlyoutPresenter.xaml
index 5c09b52e..c2fe03e7 100644
--- a/ModernWpf.Controls/Flyout/FlyoutPresenter.xaml
+++ b/ModernWpf.Controls/Flyout/FlyoutPresenter.xaml
@@ -15,7 +15,7 @@
         <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource FlyoutBorderThemeBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource FlyoutBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{DynamicResource FlyoutContentThemePadding}" />
+        <Setter Property="Padding" Value="{DynamicResource FlyoutContentPadding}" />
         <Setter Property="MinWidth" Value="{DynamicResource FlyoutThemeMinWidth}" />
         <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
         <Setter Property="MinHeight" Value="{DynamicResource FlyoutThemeMinHeight}" />
@@ -39,8 +39,7 @@
                             <Border
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                Padding="{DynamicResource FlyoutBorderThemePadding}">
+                                CornerRadius="{TemplateBinding CornerRadius}">
                                 <ScrollViewer
                                     x:Name="ScrollViewer"
                                     HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
diff --git a/ModernWpf/ControlsResources.xaml b/ModernWpf/ControlsResources.xaml
index 23cc334a..78ec11fa 100644
--- a/ModernWpf/ControlsResources.xaml
+++ b/ModernWpf/ControlsResources.xaml
@@ -69,7 +69,8 @@
     <sys:Double x:Key="ToggleSwitchPreContentMargin">6</sys:Double>
     <sys:Double x:Key="ToggleSwitchPostContentMargin">6</sys:Double>
     <sys:Double x:Key="ToggleSwitchThemeMinWidth">154</sys:Double>
-
+    <Thickness x:Key="FlyoutContentPadding">12</Thickness>
+    
     <ControlTemplate x:Key="TextControlValidationErrorTemplate">
         <Grid SnapsToDevicePixels="True">
             <AdornedElementPlaceholder />
diff --git a/ModernWpf/ThemeResources/Dark.xaml b/ModernWpf/ThemeResources/Dark.xaml
index 875db205..34ed515c 100644
--- a/ModernWpf/ThemeResources/Dark.xaml
+++ b/ModernWpf/ThemeResources/Dark.xaml
@@ -896,7 +896,7 @@
     <Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
     <Thickness x:Key="FlyoutBorderThemePadding">0</Thickness>
     <Thickness x:Key="FlyoutContentThemePadding">12,11,12,12</Thickness>
-    <m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
     <m:StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
 
     <!-- Resources for HyperlinkButton -->
diff --git a/ModernWpf/ThemeResources/HighContrast.xaml b/ModernWpf/ThemeResources/HighContrast.xaml
index 14112905..eabbdf77 100644
--- a/ModernWpf/ThemeResources/HighContrast.xaml
+++ b/ModernWpf/ThemeResources/HighContrast.xaml
@@ -684,7 +684,7 @@
     <Thickness x:Key="CommandBarOverflowPresenterBorderUpPadding">0</Thickness>
 
     <!-- Resources for CommandBarFlyout -->
-    <Thickness x:Key="CommandBarFlyoutBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="CommandBarFlyoutBorderThemeThickness">2</Thickness>
     <Thickness x:Key="CommandBarFlyoutBorderUpThemeThickness">1,1,1,0</Thickness>
     <Thickness x:Key="CommandBarFlyoutBorderDownThemeThickness">1,0,1,1</Thickness>
     <SolidColorBrush x:Key="CommandBarFlyoutButtonBackground" Color="{m:ThemeResource SystemColorButtonFaceColor}" />
@@ -775,8 +775,8 @@
     <Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
     <Thickness x:Key="FlyoutBorderThemePadding">0</Thickness>
     <Thickness x:Key="FlyoutContentThemePadding">12,11,12,12</Thickness>
-    <m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemControlPageBackgroundChromeMediumLowBrush" />
-    <m:StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemColorWindowColorBrush" />
+    <m:StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SystemColorWindowTextColorBrush" />
 
     <!-- Resources for HyperlinkButton -->
     <m:StaticResource x:Key="HyperlinkButtonForeground" ResourceKey="SystemControlHyperlinkTextBrush" />
diff --git a/ModernWpf/ThemeResources/Light.xaml b/ModernWpf/ThemeResources/Light.xaml
index e9d4ed1b..1aecb583 100644
--- a/ModernWpf/ThemeResources/Light.xaml
+++ b/ModernWpf/ThemeResources/Light.xaml
@@ -896,7 +896,7 @@
     <Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
     <Thickness x:Key="FlyoutBorderThemePadding">0</Thickness>
     <Thickness x:Key="FlyoutContentThemePadding">12,11,12,12</Thickness>
-    <m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
     <m:StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
 
     <!-- Resources for HyperlinkButton -->