From cb8cbca954fb28fba3806c8ecce972040aaab5e8 Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Mon, 1 Jun 2026 17:09:00 +0200
Subject: [PATCH] feat: allow for additional content in NavigationRail-bar

---
 src/MainDemo.Wpf/NavigationRail.xaml          | 56 +++++++++++++++++++
 .../NavigationRailAssist.cs                   |  9 ++-
 .../MaterialDesignTheme.TabControl.xaml       | 20 ++++++-
 3 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/src/MainDemo.Wpf/NavigationRail.xaml b/src/MainDemo.Wpf/NavigationRail.xaml
index d7f7733e5e..c7d393f926 100644
--- a/src/MainDemo.Wpf/NavigationRail.xaml
+++ b/src/MainDemo.Wpf/NavigationRail.xaml
@@ -792,5 +792,61 @@
         </materialDesign:Card>
       </smtx:XamlDisplay>
     </StackPanel>
+
+    <Rectangle Style="{StaticResource PageSectionSeparator}" />
+
+    <TextBlock Style="{StaticResource PageSectionTitleTextBlock}" Text="Additional End Content" />
+
+    <smtx:XamlDisplay UniqueKey="navrail_additionalEndContent_1">
+      <materialDesign:Card>
+        <TabControl Height="400"
+                    materialDesign:NavigationRailAssist.ShowSelectionBackground="True"
+                    SnapsToDevicePixels="True"
+                    Style="{StaticResource MaterialDesignNavigationRailTabControl}"
+                    TabStripPlacement="Left">
+          <materialDesign:NavigationRailAssist.AdditionalEndContent>
+            <StackPanel>
+              <Button Margin="8"
+                      Background="{DynamicResource MaterialDesign.Brush.ToolBar.Background}"
+                      Content="{materialDesign:PackIcon Kind=Person}"
+                      Style="{StaticResource MaterialDesignIconButton}" />
+              <Button Margin="8"
+                      Content="{materialDesign:PackIcon Kind=Cog}"
+                      Style="{StaticResource MaterialDesignIconButton}" />
+            </StackPanel>
+          </materialDesign:NavigationRailAssist.AdditionalEndContent>
+          <TabItem>
+            <TabItem.Header>
+              <StackPanel Width="auto" Height="auto">
+                <materialDesign:PackIcon Width="24"
+                                         Height="24"
+                                         HorizontalAlignment="Center"
+                                         Kind="Folder" />
+                <TextBlock HorizontalAlignment="Center" Text="All Files" />
+              </StackPanel>
+            </TabItem.Header>
+            <TextBlock Margin="16"
+                       Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+                       Text="All Files" />
+          </TabItem>
+
+          <TabItem>
+            <TabItem.Header>
+              <StackPanel Width="auto" Height="auto">
+                <materialDesign:PackIcon Width="24"
+                                         Height="24"
+                                         HorizontalAlignment="Center"
+                                         Kind="ClockOutline" />
+                <TextBlock HorizontalAlignment="Center" Text="Recent" />
+              </StackPanel>
+            </TabItem.Header>
+            <TextBlock Margin="16"
+                       Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+                       Text="Recent" />
+          </TabItem>
+        </TabControl>
+      </materialDesign:Card>
+    </smtx:XamlDisplay>
+
   </StackPanel>
 </UserControl>
diff --git a/src/MaterialDesignThemes.Wpf/NavigationRailAssist.cs b/src/MaterialDesignThemes.Wpf/NavigationRailAssist.cs
index 04456690b3..7da92e140f 100644
--- a/src/MaterialDesignThemes.Wpf/NavigationRailAssist.cs
+++ b/src/MaterialDesignThemes.Wpf/NavigationRailAssist.cs
@@ -2,7 +2,7 @@ namespace MaterialDesignThemes.Wpf;
 
 public static class NavigationRailAssist
 {
-    private static readonly CornerRadius DefaultCornerRadius = new CornerRadius(2.0);
+    private static readonly CornerRadius DefaultCornerRadius = new(2.0);
 
     #region CornerRadius
     /// <summary>
@@ -29,6 +29,13 @@ public static CornerRadius GetCornerRadius(DependencyObject element)
 
     #endregion
 
+    #region Property AdditionalEndContent
+    public static readonly DependencyProperty AdditionalEndContentProperty = DependencyProperty.RegisterAttached(
+        "AdditionalEndContent", typeof(object), typeof(NavigationRailAssist), new PropertyMetadata(null));
+    public static object GetAdditionalEndContent(DependencyObject obj) => (object)obj.GetValue(AdditionalEndContentProperty);
+    public static void SetAdditionalEndContent(DependencyObject obj, object value) => obj.SetValue(AdditionalEndContentProperty, value);
+    #endregion
+
     #region Property ShowSelectionBackground
 
     public static readonly DependencyProperty ShowSelectionBackgroundProperty = DependencyProperty.RegisterAttached(
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
index 6619e62af9..fef26c208d 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
@@ -820,10 +820,12 @@
                   <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="1*" />
+                    <RowDefinition Height="Auto" />
                   </Grid.RowDefinitions>
                   <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="Auto" />
                   </Grid.ColumnDefinitions>
                   <ContentPresenter x:Name="FloatingContentPanel"
                                     Grid.Row="0"
@@ -842,8 +844,16 @@
                                IsItemsHost="True"
                                Rows="0" />
 
+                  <ContentPresenter x:Name="AdditionalEndContentPresenter"
+                                    Grid.Row="2"
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Bottom"
+                                    Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:NavigationRailAssist.AdditionalEndContent)}"
+                                    Focusable="False" />
+
                   <Rectangle x:Name="DividerRect"
-                             Grid.RowSpan="2"
+                             Grid.RowSpan="3"
                              Width="1"
                              Height="Auto"
                              HorizontalAlignment="Right"
@@ -881,7 +891,7 @@
             </Trigger>
             <Trigger Property="TabStripPlacement" Value="Top">
               <Setter Property="BorderThickness" Value="0,0,0,1" />
-              <Setter TargetName="DividerRect" Property="Grid.ColumnSpan" Value="2" />
+              <Setter TargetName="DividerRect" Property="Grid.ColumnSpan" Value="3" />
               <Setter TargetName="DividerRect" Property="Grid.RowSpan" Value="1" />
               <Setter TargetName="DividerRect" Property="Height" Value="1" />
               <Setter TargetName="DividerRect" Property="HorizontalAlignment" Value="Stretch" />
@@ -892,10 +902,12 @@
               <Setter TargetName="HeaderPanel" Property="Grid.Row" Value="0" />
               <Setter TargetName="HeaderPanel" Property="Rows" Value="1" />
               <Setter TargetName="TabGrid" Property="DockPanel.Dock" Value="Top" />
+              <Setter TargetName="AdditionalEndContentPresenter" Property="Grid.Column" Value="2" />
+              <Setter TargetName="AdditionalEndContentPresenter" Property="Grid.Row" Value="0" />
             </Trigger>
             <Trigger Property="TabStripPlacement" Value="Bottom">
               <Setter Property="BorderThickness" Value="0,1,0,0" />
-              <Setter TargetName="DividerRect" Property="Grid.ColumnSpan" Value="2" />
+              <Setter TargetName="DividerRect" Property="Grid.ColumnSpan" Value="3" />
               <Setter TargetName="DividerRect" Property="Grid.RowSpan" Value="1" />
               <Setter TargetName="DividerRect" Property="Height" Value="1" />
               <Setter TargetName="DividerRect" Property="HorizontalAlignment" Value="Stretch" />
@@ -906,6 +918,8 @@
               <Setter TargetName="HeaderPanel" Property="Grid.Row" Value="0" />
               <Setter TargetName="HeaderPanel" Property="Rows" Value="1" />
               <Setter TargetName="TabGrid" Property="DockPanel.Dock" Value="Bottom" />
+              <Setter TargetName="AdditionalEndContentPresenter" Property="Grid.Column" Value="2" />
+              <Setter TargetName="AdditionalEndContentPresenter" Property="Grid.Row" Value="0" />
             </Trigger>
             <Trigger Property="TabStripPlacement" Value="Right">
               <Setter Property="BorderThickness" Value="1,0,0,0" />