Skip to content

Commit 836fcc5

Browse files
corvinszcorvinsz
authored
feat: allow for additional content in NavigationRail-bar (#4060)
1 parent da39b20 commit 836fcc5

3 files changed

Lines changed: 81 additions & 4 deletions

File tree

‎src/MainDemo.Wpf/NavigationRail.xaml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,5 +792,61 @@
792792
</materialDesign:Card>
793793
</smtx:XamlDisplay>
794794
</StackPanel>
795+
796+
<Rectangle Style="{StaticResource PageSectionSeparator}" />
797+
798+
<TextBlock Style="{StaticResource PageSectionTitleTextBlock}" Text="Additional End Content" />
799+
800+
<smtx:XamlDisplay UniqueKey="navrail_additionalEndContent_1">
801+
<materialDesign:Card>
802+
<TabControl Height="400"
803+
materialDesign:NavigationRailAssist.ShowSelectionBackground="True"
804+
SnapsToDevicePixels="True"
805+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
806+
TabStripPlacement="Left">
807+
<materialDesign:NavigationRailAssist.AdditionalEndContent>
808+
<StackPanel>
809+
<Button Margin="8"
810+
Background="{DynamicResource MaterialDesign.Brush.ToolBar.Background}"
811+
Content="{materialDesign:PackIcon Kind=Person}"
812+
Style="{StaticResource MaterialDesignIconButton}" />
813+
<Button Margin="8"
814+
Content="{materialDesign:PackIcon Kind=Cog}"
815+
Style="{StaticResource MaterialDesignIconButton}" />
816+
</StackPanel>
817+
</materialDesign:NavigationRailAssist.AdditionalEndContent>
818+
<TabItem>
819+
<TabItem.Header>
820+
<StackPanel Width="auto" Height="auto">
821+
<materialDesign:PackIcon Width="24"
822+
Height="24"
823+
HorizontalAlignment="Center"
824+
Kind="Folder" />
825+
<TextBlock HorizontalAlignment="Center" Text="All Files" />
826+
</StackPanel>
827+
</TabItem.Header>
828+
<TextBlock Margin="16"
829+
Style="{StaticResource MaterialDesignHeadline5TextBlock}"
830+
Text="All Files" />
831+
</TabItem>
832+
833+
<TabItem>
834+
<TabItem.Header>
835+
<StackPanel Width="auto" Height="auto">
836+
<materialDesign:PackIcon Width="24"
837+
Height="24"
838+
HorizontalAlignment="Center"
839+
Kind="ClockOutline" />
840+
<TextBlock HorizontalAlignment="Center" Text="Recent" />
841+
</StackPanel>
842+
</TabItem.Header>
843+
<TextBlock Margin="16"
844+
Style="{StaticResource MaterialDesignHeadline5TextBlock}"
845+
Text="Recent" />
846+
</TabItem>
847+
</TabControl>
848+
</materialDesign:Card>
849+
</smtx:XamlDisplay>
850+
795851
</StackPanel>
796852
</UserControl>

‎src/MaterialDesignThemes.Wpf/NavigationRailAssist.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace MaterialDesignThemes.Wpf;
22

33
public static class NavigationRailAssist
44
{
5-
private static readonly CornerRadius DefaultCornerRadius = new CornerRadius(2.0);
5+
private static readonly CornerRadius DefaultCornerRadius = new(2.0);
66

77
#region CornerRadius
88
/// <summary>
@@ -29,6 +29,13 @@ public static CornerRadius GetCornerRadius(DependencyObject element)
2929

3030
#endregion
3131

32+
#region Property AdditionalEndContent
33+
public static readonly DependencyProperty AdditionalEndContentProperty = DependencyProperty.RegisterAttached(
34+
"AdditionalEndContent", typeof(object), typeof(NavigationRailAssist), new PropertyMetadata(null));
35+
public static object GetAdditionalEndContent(DependencyObject obj) => (object)obj.GetValue(AdditionalEndContentProperty);
36+
public static void SetAdditionalEndContent(DependencyObject obj, object value) => obj.SetValue(AdditionalEndContentProperty, value);
37+
#endregion
38+
3239
#region Property ShowSelectionBackground
3340

3441
public static readonly DependencyProperty ShowSelectionBackgroundProperty = DependencyProperty.RegisterAttached(

‎src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -820,10 +820,12 @@
820820
<Grid.RowDefinitions>
821821
<RowDefinition Height="Auto" />
822822
<RowDefinition Height="1*" />
823+
<RowDefinition Height="Auto" />
823824
</Grid.RowDefinitions>
824825
<Grid.ColumnDefinitions>
825826
<ColumnDefinition Width="Auto" />
826827
<ColumnDefinition Width="1*" />
828+
<ColumnDefinition Width="Auto" />
827829
</Grid.ColumnDefinitions>
828830
<ContentPresenter x:Name="FloatingContentPanel"
829831
Grid.Row="0"
@@ -842,8 +844,16 @@
842844
IsItemsHost="True"
843845
Rows="0" />
844846

847+
<ContentPresenter x:Name="AdditionalEndContentPresenter"
848+
Grid.Row="2"
849+
Grid.Column="0"
850+
HorizontalAlignment="Stretch"
851+
VerticalAlignment="Bottom"
852+
Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:NavigationRailAssist.AdditionalEndContent)}"
853+
Focusable="False" />
854+
845855
<Rectangle x:Name="DividerRect"
846-
Grid.RowSpan="2"
856+
Grid.RowSpan="3"
847857
Width="1"
848858
Height="Auto"
849859
HorizontalAlignment="Right"
@@ -881,7 +891,7 @@
881891
</Trigger>
882892
<Trigger Property="TabStripPlacement" Value="Top">
883893
<Setter Property="BorderThickness" Value="0,0,0,1" />
884-
<Setter TargetName="DividerRect" Property="Grid.ColumnSpan" Value="2" />
894+
<Setter TargetName="DividerRect" Property="Grid.ColumnSpan" Value="3" />
885895
<Setter TargetName="DividerRect" Property="Grid.RowSpan" Value="1" />
886896
<Setter TargetName="DividerRect" Property="Height" Value="1" />
887897
<Setter TargetName="DividerRect" Property="HorizontalAlignment" Value="Stretch" />
@@ -892,10 +902,12 @@
892902
<Setter TargetName="HeaderPanel" Property="Grid.Row" Value="0" />
893903
<Setter TargetName="HeaderPanel" Property="Rows" Value="1" />
894904
<Setter TargetName="TabGrid" Property="DockPanel.Dock" Value="Top" />
905+
<Setter TargetName="AdditionalEndContentPresenter" Property="Grid.Column" Value="2" />
906+
<Setter TargetName="AdditionalEndContentPresenter" Property="Grid.Row" Value="0" />
895907
</Trigger>
896908
<Trigger Property="TabStripPlacement" Value="Bottom">
897909
<Setter Property="BorderThickness" Value="0,1,0,0" />
898-
<Setter TargetName="DividerRect" Property="Grid.ColumnSpan" Value="2" />
910+
<Setter TargetName="DividerRect" Property="Grid.ColumnSpan" Value="3" />
899911
<Setter TargetName="DividerRect" Property="Grid.RowSpan" Value="1" />
900912
<Setter TargetName="DividerRect" Property="Height" Value="1" />
901913
<Setter TargetName="DividerRect" Property="HorizontalAlignment" Value="Stretch" />
@@ -906,6 +918,8 @@
906918
<Setter TargetName="HeaderPanel" Property="Grid.Row" Value="0" />
907919
<Setter TargetName="HeaderPanel" Property="Rows" Value="1" />
908920
<Setter TargetName="TabGrid" Property="DockPanel.Dock" Value="Bottom" />
921+
<Setter TargetName="AdditionalEndContentPresenter" Property="Grid.Column" Value="2" />
922+
<Setter TargetName="AdditionalEndContentPresenter" Property="Grid.Row" Value="0" />
909923
</Trigger>
910924
<Trigger Property="TabStripPlacement" Value="Right">
911925
<Setter Property="BorderThickness" Value="1,0,0,0" />

0 commit comments

Comments
 (0)