From 4ed6869d4988d0e9f4bbcf2dfdb59372a4b586d0 Mon Sep 17 00:00:00 2001
From: Sia Gupta <siagupta@microsoft.com>
Date: Wed, 8 Jan 2025 10:23:54 +0530
Subject: [PATCH 1/2] Adding scrollviewer in ContextMenu

---
 .../Styles/ContextMenu.xaml                       | 15 ++++++++++-----
 .../Themes/Fluent.Dark.xaml                       |  4 +++-
 .../Themes/Fluent.HC.xaml                         |  5 ++++-
 .../Themes/Fluent.Light.xaml                      |  4 +++-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ContextMenu.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ContextMenu.xaml
index 8e58a292bfd..5e5efa6a908 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ContextMenu.xaml
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ContextMenu.xaml
@@ -38,11 +38,16 @@
                         <Border.RenderTransform>
                             <TranslateTransform />
                         </Border.RenderTransform>
-                        <StackPanel
-                            ClipToBounds="True"
-                            IsItemsHost="True"
-                            KeyboardNavigation.DirectionalNavigation="Cycle"
-                            Orientation="Vertical" />
+                        <ScrollViewer
+                            CanContentScroll="True"
+                            HorizontalScrollBarVisibility="Disabled"
+                            VerticalScrollBarVisibility="Auto">
+                            <StackPanel
+                                ClipToBounds="True"
+                                IsItemsHost="True"
+                                KeyboardNavigation.DirectionalNavigation="Cycle"
+                                Orientation="Vertical" />
+                        </ScrollViewer>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsOpen" Value="True">
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml
index 36052af4b48..9f9b2244ec2 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml
@@ -1524,7 +1524,9 @@
             <Border.RenderTransform>
               <TranslateTransform />
             </Border.RenderTransform>
-            <StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
+            <ScrollViewer CanContentScroll="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+              <StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
+            </ScrollViewer>
           </Border>
           <ControlTemplate.Triggers>
             <Trigger Property="IsOpen" Value="True">
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
index 1374934df9a..ad18301a1cf 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
@@ -617,6 +617,7 @@
   <Color x:Key="ControlFillColorInputActive">#2D3236</Color>
   <Color x:Key="ControlStrongFillColorDefault">#2D3236</Color>
   <Color x:Key="ControlStrongFillColorDisabled">#2D3236</Color>
+  <Color x:Key="SystemColorWindowColor">Transparent</Color>
   <Color x:Key="ControlSolidFillColorDefault">#2D3236</Color>
   <Color x:Key="SubtleFillColorTransparent">#2D3236</Color>
   <Color x:Key="SubtleFillColorSecondary">#2D3236</Color>
@@ -1505,7 +1506,9 @@
             <Border.RenderTransform>
               <TranslateTransform />
             </Border.RenderTransform>
-            <StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
+            <ScrollViewer CanContentScroll="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+              <StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
+            </ScrollViewer>
           </Border>
           <ControlTemplate.Triggers>
             <Trigger Property="IsOpen" Value="True">
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml
index a532d2525d1..9e89f095791 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml
@@ -1521,7 +1521,9 @@
             <Border.RenderTransform>
               <TranslateTransform />
             </Border.RenderTransform>
-            <StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
+            <ScrollViewer CanContentScroll="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+              <StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
+            </ScrollViewer>
           </Border>
           <ControlTemplate.Triggers>
             <Trigger Property="IsOpen" Value="True">

From 88527acd0ac0d32cc23b047a5a2f54a15e66e776 Mon Sep 17 00:00:00 2001
From: Sia Gupta <siagupta@microsoft.com>
Date: Wed, 8 Jan 2025 10:56:18 +0530
Subject: [PATCH 2/2] Reverting SystemColorWindowColor key creation in
 Fluent.HC.xaml

---
 .../Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
index ad18301a1cf..7084adce884 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
@@ -617,7 +617,6 @@
   <Color x:Key="ControlFillColorInputActive">#2D3236</Color>
   <Color x:Key="ControlStrongFillColorDefault">#2D3236</Color>
   <Color x:Key="ControlStrongFillColorDisabled">#2D3236</Color>
-  <Color x:Key="SystemColorWindowColor">Transparent</Color>
   <Color x:Key="ControlSolidFillColorDefault">#2D3236</Color>
   <Color x:Key="SubtleFillColorTransparent">#2D3236</Color>
   <Color x:Key="SubtleFillColorSecondary">#2D3236</Color>