Skip to content

Fix menu background #2654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keboo merged 2 commits into from
Apr 23, 2022
Merged

Fix menu background #2654

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cbcc32
fix background color of menu item
krmr Apr 20, 2022
0721dd7
fix menu background color
krmr Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
BasedOn="{x:Null}">
<Setter
Property="Background"
Value="{DynamicResource MaterialDesignPaper}" />
Value="Transparent" />
<Setter
Property="Padding"
Value="24 0 24 0"></Setter>
Expand Down Expand Up @@ -251,37 +251,41 @@
CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
<Border
x:Name="SubMenuBorder"
Background="{TemplateBinding Background}"
Background="{DynamicResource MaterialDesignPaper}"
Effect="{DynamicResource MaterialDesignShadowDepth1}"
CornerRadius="2">

<Border
Background="{TemplateBinding Background}"
CornerRadius="2">

<Border
Background="Transparent">
<ScrollViewer
<ScrollViewer
x:Name="SubMenuScrollViewer"
Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">
<Grid
<Grid
RenderOptions.ClearTypeHint="Enabled"
Margin="0 16">
<Canvas
<Canvas
HorizontalAlignment="Left"
Height="0"
VerticalAlignment="Top"
Width="0">
<Rectangle
<Rectangle
x:Name="OpaqueRect"
Fill="{Binding Background, ElementName=SubMenuBorder}"
Fill="Transparent"
Height="{Binding ActualHeight, ElementName=SubMenuBorder}"
Width="{Binding ActualWidth, ElementName=SubMenuBorder}" />
</Canvas>
<ItemsPresenter
</Canvas>
<ItemsPresenter
x:Name="ItemsPresenter"
KeyboardNavigation.DirectionalNavigation="Cycle"
Grid.IsSharedSizeScope="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
KeyboardNavigation.TabNavigation="Cycle" />
</Grid>
</ScrollViewer>
</Grid>
</ScrollViewer>
</Border>
</Border>
</Border>
</Popup>
Expand Down