Skip to content

Menu improvements #2591

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
Mar 3, 2022
Merged

Menu improvements #2591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1361af
Transparent header menu
ElieTaillard Mar 2, 2022
6bde5a4
Filling the available height with menu headers + additional menu exam…
ElieTaillard Mar 2, 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
56 changes: 48 additions & 8 deletions MainDemo.Wpf/MenusAndToolBars.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<smtx:XamlDisplay
UniqueKey="menus_1"
DockPanel.Dock="Top"
Margin="5 5 0 5">
<Menu IsMainMenu="True">
Margin="5 5 0 15">
<Menu IsMainMenu="True" Height="48">
<MenuItem Header="_File">
<MenuItem
Header="Save"
Icon="{materialDesign:PackIcon Kind=ContentSave}">
</MenuItem>

<MenuItem Header="Save As.."/>

<MenuItem
Expand All @@ -29,16 +29,16 @@
Icon="{materialDesign:PackIcon Kind=ExitToApp}"/>

<Separator/>

<MenuItem
Header="Excellent"
IsCheckable="True"
IsChecked="True"/>

<MenuItem
Header="Rubbish"
IsCheckable="True"/>

<MenuItem
Header="Dig Deeper"
InputGestureText="Ctrl+D">
Expand All @@ -49,15 +49,15 @@
Header="Disappointment"
IsCheckable="True"/>
</MenuItem>

<MenuItem
Header="Look Deeper"
InputGestureText="Ctrl+D">
<MenuItem Header="Plain"/>
<MenuItem Header="Ice Cream"/>
</MenuItem>
</MenuItem>

<MenuItem Header="_Edit">
<MenuItem
Header="_Cut"
Expand All @@ -77,6 +77,46 @@
</Menu>
</smtx:XamlDisplay>

<smtx:XamlDisplay
UniqueKey="bigMenu"
DockPanel.Dock="Top"
Margin="5 5 0 5">
<materialDesign:Card Height="80">
<Menu>
<MenuItem Header="Big">
<MenuItem Header="Test 1"/>
<MenuItem Header="Test 1"/>
<MenuItem Header="Test 1"/>
</MenuItem>
<MenuItem Header="Menu">
<MenuItem Header="Test 1"/>
<MenuItem Header="Test 1"/>
<MenuItem Header="Test 1"/>
</MenuItem>
</Menu>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay
UniqueKey="smallMenu"
DockPanel.Dock="Top"
Margin="5 5 0 20">
<materialDesign:Card Height="25">
<Menu>
<MenuItem Header="Small">
<MenuItem Header="Test 1"/>
<MenuItem Header="Test 1"/>
<MenuItem Header="Test 1"/>
</MenuItem>
<MenuItem Header="Menu">
<MenuItem Header="Test 1"/>
<MenuItem Header="Test 1"/>
<MenuItem Header="Test 1"/>
</MenuItem>
</Menu>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay
UniqueKey="menus_2"
DockPanel.Dock="Top"
Expand Down
11 changes: 7 additions & 4 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@
TargetType="{x:Type MenuItem}"
x:Key="MaterialDesignMenuItem"
BasedOn="{x:Null}">
<Setter
Property="Background"
Value="{DynamicResource MaterialDesignPaper}" />
<Setter
Property="Padding"
Value="24 0 24 0"></Setter>
Expand Down Expand Up @@ -114,7 +117,7 @@
x:Name="templateRoot"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}"

SnapsToDevicePixels="True" />
<Border
x:Name="BackgroundRoot"
Expand Down Expand Up @@ -248,7 +251,7 @@
CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
<Border
x:Name="SubMenuBorder"
Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=MenuBase}}"
Background="{DynamicResource MaterialDesignPaper}"
Effect="{DynamicResource MaterialDesignShadowDepth1}"
CornerRadius="2">

Expand Down Expand Up @@ -334,7 +337,7 @@
Value="16 0" />
<Setter
Property="Height"
Value="48" />
Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type Menu}}}" />
<Setter
TargetName="templateRoot"
Property="CornerRadius"
Expand Down Expand Up @@ -471,7 +474,7 @@

<Setter
Property="Background"
Value="{DynamicResource MaterialDesignPaper}" />
Value="Transparent" />
<Setter
Property="FontFamily"
Value="{StaticResource MaterialDesignFont}" />
Expand Down