From b2bd326c6505d888cbe9e17fc144e430d062931c Mon Sep 17 00:00:00 2001
From: Yimeng Wu <me@kinnara.cn>
Date: Thu, 14 Dec 2023 23:21:18 +0000
Subject: [PATCH] Port microsoft/microsoft-ui-xaml#4857 (#651)

---
 ModernWpf/Styles/ContextMenu.xaml | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/ModernWpf/Styles/ContextMenu.xaml b/ModernWpf/Styles/ContextMenu.xaml
index 2dce5dbdc..8254dd361 100644
--- a/ModernWpf/Styles/ContextMenu.xaml
+++ b/ModernWpf/Styles/ContextMenu.xaml
@@ -36,25 +36,19 @@
                         SnapsToDevicePixels="True">
                         <Border
                             Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}">
-                            <Grid>
-                                <ScrollViewer
-                                    x:Name="ContextMenuScrollViewer"
-                                    Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer,
-                                                                                  TypeInTargetAssembly={x:Type FrameworkElement}}}"
-                                    Margin="{TemplateBinding Padding}"
-                                    MinWidth="{DynamicResource FlyoutThemeMinWidth}">
-                                    <ItemsPresenter
-                                        RenderOptions.ClearTypeHint="Enabled"
-                                        KeyboardNavigation.DirectionalNavigation="Cycle"
-                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                </ScrollViewer>
-                                <Border
-                                    x:Name="ContextMenuBorder"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}" />
-                            </Grid>
+                            <ScrollViewer
+                                x:Name="ContextMenuScrollViewer"
+                                Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}"
+                                Margin="{TemplateBinding Padding}"
+                                MinWidth="{DynamicResource FlyoutThemeMinWidth}">
+                                <ItemsPresenter
+                                    RenderOptions.ClearTypeHint="Enabled"
+                                    KeyboardNavigation.DirectionalNavigation="Cycle"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            </ScrollViewer>
                         </Border>
                     </primitives:ThemeShadowChrome>
                 </ControlTemplate>