Skip to content

Commit 8a21696

Browse files
authored
Adding ScrollViewer to ContextMenu (#10239)
* Adding scrollviewer in ContextMenu * Reverting SystemColorWindowColor key creation in Fluent.HC.xaml
1 parent 2fa8170 commit 8a21696

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ContextMenu.xaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,16 @@
3838
<Border.RenderTransform>
3939
<TranslateTransform />
4040
</Border.RenderTransform>
41-
<StackPanel
42-
ClipToBounds="True"
43-
IsItemsHost="True"
44-
KeyboardNavigation.DirectionalNavigation="Cycle"
45-
Orientation="Vertical" />
41+
<ScrollViewer
42+
CanContentScroll="True"
43+
HorizontalScrollBarVisibility="Disabled"
44+
VerticalScrollBarVisibility="Auto">
45+
<StackPanel
46+
ClipToBounds="True"
47+
IsItemsHost="True"
48+
KeyboardNavigation.DirectionalNavigation="Cycle"
49+
Orientation="Vertical" />
50+
</ScrollViewer>
4651
</Border>
4752
<ControlTemplate.Triggers>
4853
<Trigger Property="IsOpen" Value="True">

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1536,7 +1536,9 @@
15361536
<Border.RenderTransform>
15371537
<TranslateTransform />
15381538
</Border.RenderTransform>
1539-
<StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
1539+
<ScrollViewer CanContentScroll="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
1540+
<StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
1541+
</ScrollViewer>
15401542
</Border>
15411543
<ControlTemplate.Triggers>
15421544
<Trigger Property="IsOpen" Value="True">

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1517,7 +1517,9 @@
15171517
<Border.RenderTransform>
15181518
<TranslateTransform />
15191519
</Border.RenderTransform>
1520-
<StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
1520+
<ScrollViewer CanContentScroll="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
1521+
<StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
1522+
</ScrollViewer>
15211523
</Border>
15221524
<ControlTemplate.Triggers>
15231525
<Trigger Property="IsOpen" Value="True">

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,9 @@
15331533
<Border.RenderTransform>
15341534
<TranslateTransform />
15351535
</Border.RenderTransform>
1536-
<StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
1536+
<ScrollViewer CanContentScroll="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
1537+
<StackPanel ClipToBounds="True" IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" Orientation="Vertical" />
1538+
</ScrollViewer>
15371539
</Border>
15381540
<ControlTemplate.Triggers>
15391541
<Trigger Property="IsOpen" Value="True">

0 commit comments

Comments
 (0)