From 6d038582a73c9deb75a32b08cc5962a78955b721 Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Mon, 30 Mar 2026 17:10:53 -0700
Subject: [PATCH 1/3] Fix ToolBar overflow button background not inheriting
 from ToolBar

Change the overflow button styles to bind their Background to the
ancestor ToolBar's Background instead of hardcoding the theme resource.
This ensures the overflow button matches when a custom Background is
set on the ToolBar.

Changes:
- Both vertical and horizontal overflow button styles now use a
  RelativeSource binding to the parent ToolBar's Background
- Overflow popup border uses TemplateBinding to inherit Background
- Removed redundant Background reset in the vertical orientation trigger

Fixes #3694

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Themes/MaterialDesignTheme.ToolBar.xaml   |  7 +++---
 .../WPF/ToolBars/ToolBarTests.cs              | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
index a043a77973..0c554972f2 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
@@ -17,7 +17,7 @@
   </ResourceDictionary.MergedDictionaries>
 
   <Style x:Key="MaterialDesignToolBarVerticalOverflowButtonStyle" TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.ToolBar.Background}" />
+    <Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource AncestorType=ToolBar}}" />
     <Setter Property="MinHeight" Value="0" />
     <Setter Property="MinWidth" Value="0" />
     <Setter Property="Template">
@@ -55,7 +55,7 @@
   </Style>
 
   <Style x:Key="MaterialDesignToolBarHorizontalOverflowButtonStyle" TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.ToolBar.Background}" />
+    <Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource AncestorType=ToolBar}}" />
     <Setter Property="MinHeight" Value="0" />
     <Setter Property="MinWidth" Value="0" />
     <Setter Property="Template">
@@ -187,7 +187,7 @@
                      CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
                 <Border x:Name="ToolBarSubMenuBorder"
                         Margin="1"
-                        Background="{DynamicResource MaterialDesign.Brush.ToolBar.Background}"
+                        Background="{TemplateBinding Background}"
                         BorderBrush="{DynamicResource MaterialDesign.Brush.ToolBar.Overflow.Border}"
                         BorderThickness="1"
                         CornerRadius="2"
@@ -246,7 +246,6 @@
               <Setter TargetName="ToolBarSubMenuBorder" Property="Margin" Value="5,5,5,5" />
             </Trigger>
             <Trigger Property="Orientation" Value="Vertical">
-              <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.ToolBar.Background}" />
               <Setter TargetName="Grid" Property="Margin" Value="1,3,1,1" />
               <Setter TargetName="MainPanelBorder" Property="Margin" Value="0,0,0,11" />
               <Setter TargetName="OverflowButton" Property="Style" Value="{StaticResource MaterialDesignToolBarVerticalOverflowButtonStyle}" />
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
index 9c576eb180..47e84bbb91 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Windows.Media;
 
 
 namespace MaterialDesignThemes.UITests.WPF.ToolBars;
@@ -30,4 +31,28 @@ public async Task ToolBar_OverflowGrid_RespectsOrientation(Orientation orientati
 
         recorder.Success();
     }
+
+    [Description("Issue 3694")]
+    [Test]
+    public async Task ToolBar_OverflowButton_InheritsCustomBackground()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        var toolBarTray = await LoadXaml<ToolBarTray>(@"
+<ToolBarTray DockPanel.Dock=""Top"">
+  <ToolBar Style=""{StaticResource MaterialDesignToolBar}"" Background=""Fuchsia"" OverflowMode=""Always"">
+    <Button Content=""{materialDesign:PackIcon Kind=File}""/>
+  </ToolBar>
+</ToolBarTray>");
+        var overflowButton = await toolBarTray.GetElement<ToggleButton>("OverflowButton");
+
+        //Act
+        Color? overflowBackground = await overflowButton.GetBackgroundColor();
+
+        //Assert
+        await Assert.That(overflowBackground).IsEqualTo(Colors.Fuchsia);
+
+        recorder.Success();
+    }
 }

From 16e0f2e753b935ae47ea7a1de9dc894b05ae4032 Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Wed, 1 Apr 2026 18:03:58 -0700
Subject: [PATCH 2/3] Add demo toolbar with custom background to showcase
 overflow button fix

Adds a second toolbar example in both MainDemo and MaterialDesign3.Demo
that uses a custom background with overflow items forced via
OverflowMode=Always, demonstrating that the overflow button now
inherits the toolbar's background color.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/MainDemo.Wpf/MenusAndToolBars.xaml         | 16 ++++++++++++++++
 .../MenusAndToolBars.xaml                      | 18 ++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/MainDemo.Wpf/MenusAndToolBars.xaml b/src/MainDemo.Wpf/MenusAndToolBars.xaml
index acd222f9e0..99a491c60f 100644
--- a/src/MainDemo.Wpf/MenusAndToolBars.xaml
+++ b/src/MainDemo.Wpf/MenusAndToolBars.xaml
@@ -378,6 +378,22 @@
       </ToolBarTray>
     </smtx:XamlDisplay>
 
+    <smtx:XamlDisplay Margin="0,16,0,16" UniqueKey="menus_toolbar_custom_bg">
+      <ToolBarTray>
+        <ToolBar Background="{DynamicResource MaterialDesign.Brush.Primary.Dark}"
+                 ClipToBounds="False"
+                 Style="{StaticResource MaterialDesignToolBar}">
+          <Button Content="{materialDesign:PackIcon Kind=ContentSave}" ToolTip="Save" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentCut}" ToolTip="Cut" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentCopy}" ToolTip="Copy" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentPaste}" ToolTip="Paste" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatBold}" ToolBar.OverflowMode="Always" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatItalic}" ToolBar.OverflowMode="Always" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatUnderline}" ToolBar.OverflowMode="Always" />
+        </ToolBar>
+      </ToolBarTray>
+    </smtx:XamlDisplay>
+
     <Rectangle Style="{StaticResource PageSectionSeparator}" />
     <TextBlock Style="{StaticResource PageSectionTitleTextBlock}" Text="Context Menus" />
 
diff --git a/src/MaterialDesign3.Demo.Wpf/MenusAndToolBars.xaml b/src/MaterialDesign3.Demo.Wpf/MenusAndToolBars.xaml
index f83183239c..4007081920 100644
--- a/src/MaterialDesign3.Demo.Wpf/MenusAndToolBars.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/MenusAndToolBars.xaml
@@ -346,6 +346,24 @@
       </ToolBarTray>
     </smtx:XamlDisplay>
 
+    <smtx:XamlDisplay Margin="5,16,0,16"
+                      DockPanel.Dock="Top"
+                      UniqueKey="menus_toolbar_custom_bg">
+      <ToolBarTray>
+        <ToolBar Background="{DynamicResource MaterialDesign.Brush.Primary.Dark}"
+                 ClipToBounds="False"
+                 Style="{StaticResource MaterialDesignToolBar}">
+          <Button Content="{materialDesign:PackIcon Kind=ContentSave}" ToolTip="Save" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentCut}" ToolTip="Cut" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentCopy}" ToolTip="Copy" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentPaste}" ToolTip="Paste" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatBold}" ToolBar.OverflowMode="Always" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatItalic}" ToolBar.OverflowMode="Always" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatUnderline}" ToolBar.OverflowMode="Always" />
+        </ToolBar>
+      </ToolBarTray>
+    </smtx:XamlDisplay>
+
     <Rectangle Style="{StaticResource PageSectionSeparator}" />
     <TextBlock Style="{StaticResource PageSectionTitleTextBlock}" Text="Context Menus" />
 

From 9090d460e30e56229ac2ccc6a8838b0eddf4415a Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Thu, 2 Apr 2026 23:16:23 -0700
Subject: [PATCH 3/3] Update demo toolbar background to standard Primary brush

Updates the custom background ToolBar in the demo app to use the standard Primary brush instead of the Dark variant. This continues to demonstrate that the overflow button correctly inherits the ToolBar's background color while using a more conventional theme resource.
---
 src/MainDemo.Wpf/MenusAndToolBars.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MainDemo.Wpf/MenusAndToolBars.xaml b/src/MainDemo.Wpf/MenusAndToolBars.xaml
index 99a491c60f..e07c19e356 100644
--- a/src/MainDemo.Wpf/MenusAndToolBars.xaml
+++ b/src/MainDemo.Wpf/MenusAndToolBars.xaml
@@ -380,7 +380,7 @@
 
     <smtx:XamlDisplay Margin="0,16,0,16" UniqueKey="menus_toolbar_custom_bg">
       <ToolBarTray>
-        <ToolBar Background="{DynamicResource MaterialDesign.Brush.Primary.Dark}"
+        <ToolBar Background="{DynamicResource MaterialDesign.Brush.Primary}"
                  ClipToBounds="False"
                  Style="{StaticResource MaterialDesignToolBar}">
           <Button Content="{materialDesign:PackIcon Kind=ContentSave}" ToolTip="Save" />