Skip to content

NavigationRail, NavigationBar, NavigationDrawer controls for MaterialDesign3 #2628

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 17 commits into from
Apr 15, 2022
Merged

NavigationRail, NavigationBar, NavigationDrawer controls for MaterialDesign3 #2628

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c6fd7e1
Test Material Design 3 Listbox
StefanoRivolta-Previero Feb 10, 2022
15fe77b
Update Material Design 3 Navigation Rail
StefanoRivolta-Previero Feb 14, 2022
36fa8d4
Merge branch 'master' into listbox
StefanoRivolta-Previero Feb 14, 2022
1ce20e2
merge
StefanoRivolta-Previero Mar 23, 2022
24fcd3f
Merge branch 'master' into listbox
StefanoRivolta-Previero Mar 29, 2022
289e990
Fix Shadow bug in Drawer
StefanoRivolta-Previero Mar 30, 2022
06b0a84
Add NavigationRail, NavigationBar, NavigationDrawer
StefanoRivolta-Previero Mar 30, 2022
76a6e5c
Add NavigationRail and NavigationBar pages
StefanoRivolta-Previero Mar 30, 2022
029db6b
Showcase new Navigation controls in DemoApp
StefanoRivolta-Previero Mar 30, 2022
76c528c
Merge branch 'master' into listbox
StefanoRivolta-Previero Mar 30, 2022
98f234b
Update MaterialDesign3.Demo.Wpf/Domain/SampleItem.cs
StefanoRivolta-Previero Mar 31, 2022
9414d8d
Change style names
StefanoRivolta-Previero Apr 4, 2022
9c9babe
Add XamlDisplay
StefanoRivolta-Previero Apr 4, 2022
56f742e
Add new Badged Style
StefanoRivolta-Previero Apr 4, 2022
ed21dee
Add badge to navigation controls
StefanoRivolta-Previero Apr 4, 2022
9e8e6fe
Add badge examples
StefanoRivolta-Previero Apr 4, 2022
bd3a881
Fix nullable warning
StefanoRivolta-Previero Apr 4, 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
Prev Previous commit
Next Next commit
Add new Badged Style
  • Loading branch information
@StefanoRivolta-Previero
StefanoRivolta-Previero committed Apr 4, 2022
commit 56f742eaecee7dc82d2e3c17df82598b86037341
1 change: 1 addition & 0 deletions MaterialDesignThemes.Wpf/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

<!-- set up default styles for our custom Material Design in XAML Toolkit controls -->
<Style TargetType="{x:Type local:Clock}" BasedOn="{StaticResource MaterialDesignClock}" />
<Style TargetType="{x:Type local:Badged}" BasedOn="{StaticResource MaterialDesignBadge}" />
<Style TargetType="{x:Type local:PopupBox}" BasedOn="{StaticResource MaterialDesignPopupBox}" />
<Style TargetType="{x:Type local:TimePicker}" BasedOn="{StaticResource MaterialDesignTimePicker}" />

Expand Down
3 changes: 2 additions & 1 deletion MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Badged.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Calendar.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.CheckBox.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Chip.xaml" />
Expand Down Expand Up @@ -50,7 +51,7 @@
<SolidColorBrush x:Key="MaterialDesignDarkForeground" Color="#FFFAFAFA"/>
<SolidColorBrush x:Key="MaterialDesignDarkSeparatorBackground" Color="#1F000000" />
<SolidColorBrush x:Key="MaterialDesignLightSeparatorBackground" Color="#1FFFFFFF" />

<Style TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignRaisedButton}" />
<Style TargetType="{x:Type Calendar}" BasedOn="{StaticResource MaterialDesignCalendarPortrait}" />
<Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource MaterialDesignCheckBox}" />
Expand Down
1 change: 1 addition & 0 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.NavigationDrawer.xaml" />

<!-- MaterialDesign2 -->
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Badged.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Calendar.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.CheckBox.xaml" />
Expand Down
111 changes: 110 additions & 1 deletion MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Badged.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</DoubleAnimationUsingKeyFrames>
</Storyboard>

<Style TargetType="{x:Type wpf:Badged}">
<Style TargetType="{x:Type wpf:Badged}" x:Key="MaterialDesignBadge">
<Setter Property="IsTabStop" Value="False" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top" />
Expand Down Expand Up @@ -136,4 +136,113 @@
</Style.Triggers>
</Style>

<Style TargetType="{x:Type wpf:Badged}" x:Key="MaterialDesignMiniBadge">
<Setter Property="IsTabStop" Value="False" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="BadgeColorZoneMode" Value="PrimaryLight" />
<Setter Property="BadgePlacementMode" Value="TopRight" />
<Setter Property="BadgeChangedStoryboard" Value="{StaticResource BadgeChangedStoryboard}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type wpf:Badged}">
<Grid>
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}">
<ContentPresenter Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
<Border x:Name="PART_BadgeContainer"
CornerRadius="{TemplateBinding CornerRadius}" Background="{TemplateBinding BadgeBackground}"
Width="6" Height="6"
HorizontalAlignment="Left" VerticalAlignment="Top" Padding="2"
TextElement.FontSize="11"
TextElement.FontWeight="DemiBold"
RenderTransformOrigin=".5,.5"
Visibility="{TemplateBinding IsBadgeSet, Converter={StaticResource BooleanToVisibilityConverter}}">
<Border.RenderTransform>
<ScaleTransform ScaleX="1" ScaleY="1" />
</Border.RenderTransform>
</Border>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="BadgePlacementMode" Value="TopLeft">
<Setter TargetName="PART_BadgeContainer" Property="HorizontalAlignment" Value="Left" />
<Setter TargetName="PART_BadgeContainer" Property="VerticalAlignment" Value="Top" />
</Trigger>
<Trigger Property="BadgePlacementMode" Value="Top">
<Setter TargetName="PART_BadgeContainer" Property="HorizontalAlignment" Value="Center" />
<Setter TargetName="PART_BadgeContainer" Property="VerticalAlignment" Value="Top" />
</Trigger>
<Trigger Property="BadgePlacementMode" Value="TopRight">
<Setter TargetName="PART_BadgeContainer" Property="HorizontalAlignment" Value="Right" />
<Setter TargetName="PART_BadgeContainer" Property="VerticalAlignment" Value="Top" />
</Trigger>
<Trigger Property="BadgePlacementMode" Value="Right">
<Setter TargetName="PART_BadgeContainer" Property="HorizontalAlignment" Value="Right" />
<Setter TargetName="PART_BadgeContainer" Property="VerticalAlignment" Value="Center" />
</Trigger>
<Trigger Property="BadgePlacementMode" Value="BottomRight">
<Setter TargetName="PART_BadgeContainer" Property="HorizontalAlignment" Value="Right" />
<Setter TargetName="PART_BadgeContainer" Property="VerticalAlignment" Value="Bottom" />
</Trigger>
<Trigger Property="BadgePlacementMode" Value="Bottom">
<Setter TargetName="PART_BadgeContainer" Property="HorizontalAlignment" Value="Center" />
<Setter TargetName="PART_BadgeContainer" Property="VerticalAlignment" Value="Bottom" />
</Trigger>
<Trigger Property="BadgePlacementMode" Value="BottomLeft">
<Setter TargetName="PART_BadgeContainer" Property="HorizontalAlignment" Value="Left" />
<Setter TargetName="PART_BadgeContainer" Property="VerticalAlignment" Value="Bottom" />
</Trigger>
<Trigger Property="BadgePlacementMode" Value="Left">
<Setter TargetName="PART_BadgeContainer" Property="HorizontalAlignment" Value="Left" />
<Setter TargetName="PART_BadgeContainer" Property="VerticalAlignment" Value="Center" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="BadgeColorZoneMode" Value="Standard">
<Setter Property="BadgeBackground" Value="{DynamicResource MaterialDesignPaper}" />
<Setter Property="BadgeForeground" Value="{DynamicResource MaterialDesignBody}" />
</Trigger>
<Trigger Property="BadgeColorZoneMode" Value="Inverted">
<Setter Property="BadgeBackground" Value="{DynamicResource MaterialDesignBody}" />
<Setter Property="BadgeForeground" Value="{DynamicResource MaterialDesignPaper}" />
</Trigger>
<Trigger Property="BadgeColorZoneMode" Value="PrimaryLight">
<Setter Property="BadgeBackground" Value="{DynamicResource PrimaryHueLightBrush}" />
<Setter Property="BadgeForeground" Value="{DynamicResource PrimaryHueLightForegroundBrush}" />
</Trigger>
<Trigger Property="BadgeColorZoneMode" Value="PrimaryMid">
<Setter Property="BadgeBackground" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="BadgeForeground" Value="{DynamicResource PrimaryHueMidForegroundBrush}" />
</Trigger>
<Trigger Property="BadgeColorZoneMode" Value="PrimaryDark">
<Setter Property="BadgeBackground" Value="{DynamicResource PrimaryHueDarkBrush}" />
<Setter Property="BadgeForeground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}" />
</Trigger>
<Trigger Property="BadgeColorZoneMode" Value="SecondaryMid">
<Setter Property="BadgeBackground" Value="{DynamicResource SecondaryHueMidBrush}" />
<Setter Property="BadgeForeground" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
</Trigger>
<Trigger Property="BadgeColorZoneMode" Value="Light">
<Setter Property="BadgeBackground" Value="{DynamicResource MaterialDesignLightBackground}" />
<Setter Property="BadgeForeground" Value="{DynamicResource MaterialDesignLightForeground}" />
</Trigger>
<Trigger Property="BadgeColorZoneMode" Value="Dark">
<Setter Property="BadgeBackground" Value="{DynamicResource MaterialDesignDarkBackground}" />
<Setter Property="BadgeForeground" Value="{DynamicResource MaterialDesignDarkForeground}" />
</Trigger>
</Style.Triggers>
</Style>

</ResourceDictionary>