Consolidate Separator styles and remove redundant StatusBar separator brush

Keboo · Keboo · commit 91d3449bfc57 · 2026-03-12T22:24:53.000-07:00
Centralizes the MaterialDesignSeparator style into a new resource dictionary and replaces the specific StatusBar.Separator brush with the general separator background brush. This refactor simplifies the theme definitions and ensures consistent separator styling across the StatusBar, Menu, and PopupBox components.

The change also updates the StatusBar demo with colored icons and explicit heights to better showcase the UI.
diff --git a/src/MainDemo.Wpf/StatusBars.xaml b/src/MainDemo.Wpf/StatusBars.xaml
@@ -29,8 +29,9 @@
     <smtx:XamlDisplay HorizontalAlignment="Left" UniqueKey="statusbar_2">
       <StatusBar>
         <StatusBarItem>
-          <StackPanel Orientation="Horizontal">
+          <StackPanel Orientation="Horizontal" Height="40">
             <materialDesign:PackIcon Kind="CheckCircle"
+                                     Foreground="Lime"
                                      VerticalAlignment="Center"
                                      Margin="0,0,4,0" />
             <TextBlock Text="Build succeeded" VerticalAlignment="Center" />
@@ -50,7 +51,8 @@
           <StackPanel Orientation="Horizontal">
             <materialDesign:PackIcon Kind="AlertCircleOutline"
                                      VerticalAlignment="Center"
-                                     Margin="0,0,4,0" />
+                                     Margin="0,0,4,0"
+                                     Foreground="Red"/>
             <TextBlock Text="0 Errors" VerticalAlignment="Center" />
           </StackPanel>
         </StatusBarItem>
@@ -59,7 +61,8 @@
           <StackPanel Orientation="Horizontal">
             <materialDesign:PackIcon Kind="Alert"
                                      VerticalAlignment="Center"
-                                     Margin="0,0,4,0" />
+                                     Margin="0,0,4,0"
+                                     Foreground="Orange"/>
             <TextBlock Text="2 Warnings" VerticalAlignment="Center" />
           </StackPanel>
         </StatusBarItem>
diff --git a/src/MaterialDesignThemes.Wpf/ResourceDictionaryExtensions.g.cs b/src/MaterialDesignThemes.Wpf/ResourceDictionaryExtensions.g.cs
@@ -86,7 +86,6 @@ private static partial void LoadThemeColors(ResourceDictionary resourceDictionar
         theme.Separators.Background = GetColor(resourceDictionary, "MaterialDesign.Brush.Separator.Background");
         theme.StatusBars.Background = GetColor(resourceDictionary, "MaterialDesign.Brush.StatusBar.Background");
         theme.StatusBars.Foreground = GetColor(resourceDictionary, "MaterialDesign.Brush.StatusBar.Foreground");
-        theme.StatusBars.Separator = GetColor(resourceDictionary, "MaterialDesign.Brush.StatusBar.Separator");
         theme.TabControls.Divider = GetColor(resourceDictionary, "MaterialDesign.Brush.TabControl.Divider");
         theme.ToolBars.Background = GetColor(resourceDictionary, "MaterialDesign.Brush.ToolBar.Background", "MaterialDesignToolBarBackground");
         theme.ToolBars.Separator = GetColor(resourceDictionary, "MaterialDesign.Brush.ToolBar.Separator");
@@ -232,7 +231,6 @@ private static partial void ApplyThemeColors(ResourceDictionary resourceDictiona
         SetSolidColorBrush(resourceDictionary, "MaterialDesign.Brush.Separator.Background", theme.Separators.Background);
         SetSolidColorBrush(resourceDictionary, "MaterialDesign.Brush.StatusBar.Background", theme.StatusBars.Background);
         SetSolidColorBrush(resourceDictionary, "MaterialDesign.Brush.StatusBar.Foreground", theme.StatusBars.Foreground);
-        SetSolidColorBrush(resourceDictionary, "MaterialDesign.Brush.StatusBar.Separator", theme.StatusBars.Separator);
         SetSolidColorBrush(resourceDictionary, "MaterialDesign.Brush.TabControl.Divider", theme.TabControls.Divider);
         SetSolidColorBrush(resourceDictionary, "MaterialDesign.Brush.ToolBar.Background", theme.ToolBars.Background);
         SetSolidColorBrush(resourceDictionary, "MaterialDesignToolBarBackground", theme.ToolBars.Background);
diff --git a/src/MaterialDesignThemes.Wpf/Theme.g.cs b/src/MaterialDesignThemes.Wpf/Theme.g.cs
@@ -828,13 +828,6 @@ public ColorReference Foreground
            set => _foreground = value;
         }
 
-        private ColorReference _separator;
-        public ColorReference Separator
-        {
-           get => _theme.Resolve(_separator);
-           set => _separator = value;
-        }
-
     }
 
     public class TabControl
diff --git a/src/MaterialDesignThemes.Wpf/ThemeExtensions.g.cs b/src/MaterialDesignThemes.Wpf/ThemeExtensions.g.cs
@@ -91,7 +91,6 @@ public static partial void SetLightTheme(this Theme theme)
         theme.Separators.Background = BaseThemeColors.Neutral800;
         theme.StatusBars.Background = BaseThemeColors.Neutral900;
         theme.StatusBars.Foreground = BaseThemeColors.Black900;
-        theme.StatusBars.Separator = BaseThemeColors.Black100;
         theme.TabControls.Divider = BaseThemeColors.Black100;
         theme.ToolBars.Background = BaseThemeColors.Neutral900;
         theme.ToolBars.Separator = BaseThemeColors.Black100;
@@ -183,7 +182,6 @@ public static partial void SetDarkTheme(this Theme theme)
         theme.Separators.Background = BaseThemeColors.Neutral400;
         theme.StatusBars.Background = BaseThemeColors.Neutral50;
         theme.StatusBars.Foreground = BaseThemeColors.White900;
-        theme.StatusBars.Separator = BaseThemeColors.White100;
         theme.TabControls.Divider = BaseThemeColors.White100;
         theme.ToolBars.Background = BaseThemeColors.Neutral50;
         theme.ToolBars.Separator = BaseThemeColors.White100;
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml
@@ -30,6 +30,7 @@
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.RichTextBox.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ScrollBar.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ScrollViewer.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Separator.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Shadows.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Slider.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.StatusBar.xaml" />
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml
@@ -38,6 +38,7 @@
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.RichTextBox.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ScrollBar.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ScrollViewer.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Separator.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Shadows.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.StatusBar.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TabControl.xaml" />
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Dark.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Dark.xaml
@@ -74,7 +74,6 @@
   <colors:StaticResource x:Key="MaterialDesign.Brush.SnackBar.MouseOver" ResourceKey="Neutral700" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.StatusBar.Background" ResourceKey="Neutral50" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.StatusBar.Foreground" ResourceKey="White900" />
-  <colors:StaticResource x:Key="MaterialDesign.Brush.StatusBar.Separator" ResourceKey="White100" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.TabControl.Divider" ResourceKey="White100" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.TextBox.DisabledBackground" ResourceKey="White50" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.TextBox.FilledBackground" ResourceKey="White100" />
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Light.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Light.xaml
@@ -74,7 +74,6 @@
   <colors:StaticResource x:Key="MaterialDesign.Brush.SnackBar.MouseOver" ResourceKey="Neutral200" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.StatusBar.Background" ResourceKey="Neutral900" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.StatusBar.Foreground" ResourceKey="Black900" />
-  <colors:StaticResource x:Key="MaterialDesign.Brush.StatusBar.Separator" ResourceKey="Black100" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.TabControl.Divider" ResourceKey="Black100" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.TextBox.DisabledBackground" ResourceKey="Black50" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.TextBox.FilledBackground" ResourceKey="Black50" />
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
@@ -4,6 +4,7 @@
                     xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Font.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Separator.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
   <ContextMenu x:Key="MaterialDesignDefaultContextMenu" FontFamily="{Binding PlacementTarget.FontFamily, RelativeSource={RelativeSource Self}}">
@@ -30,24 +31,6 @@
     </MenuItem>
   </ContextMenu>
 
-  <Style x:Key="MaterialDesignSeparator" TargetType="{x:Type Separator}">
-    <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Separator.Background}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Separator.Background}" />
-    <Setter Property="Height" Value="16" />
-    <Setter Property="MinHeight" Value="1" />
-    <Setter Property="SnapsToDevicePixels" Value="true" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Separator}">
-          <Rectangle Height="1"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Center"
-                     Fill="{TemplateBinding Background}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
   <Style x:Key="MaterialDesignMenuItem"
          TargetType="{x:Type MenuItem}"
          BasedOn="{x:Null}">
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
@@ -5,7 +5,7 @@
 
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
-    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Menu.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Separator.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToolTip.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Separator.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Separator.xaml
@@ -0,0 +1,26 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
+                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
+  
+  <Style x:Key="MaterialDesignSeparator" TargetType="{x:Type Separator}">
+    <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Separator.Background}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Separator.Background}" />
+    <Setter Property="Height" Value="1" />
+    <Setter Property="MinHeight" Value="1" />
+    <Setter Property="SnapsToDevicePixels" Value="true" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type Separator}">
+          <Rectangle Height="{TemplateBinding Height}"
+                     Width="{TemplateBinding Width}"
+                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                     Fill="{TemplateBinding Background}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+</ResourceDictionary>
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.StatusBar.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.StatusBar.xaml
@@ -1,19 +1,24 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Separator.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+  
   <Style x:Key="MaterialDesignStatusBar" TargetType="{x:Type StatusBar}">
     <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.StatusBar.Background}" />
     <Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.StatusBar.Foreground}" />
     <Setter Property="MinHeight" Value="24" />
+    <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Separator.Background}" />
+    <Setter Property="BorderThickness" Value="0,1,0,0" />
     <Setter Property="SnapsToDevicePixels" Value="True" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type StatusBar}">
           <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{DynamicResource MaterialDesign.Brush.StatusBar.Separator}"
-                  BorderThickness="0,1,0,0"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
                   Padding="{TemplateBinding Padding}"
-                  SnapsToDevicePixels="True">
+                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
             <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
           </Border>
         </ControlTemplate>
@@ -37,21 +42,14 @@
     </Setter>
   </Style>
 
-  <Style x:Key="{x:Static StatusBar.SeparatorStyleKey}" TargetType="{x:Type Separator}">
-    <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.StatusBar.Separator}" />
-    <Setter Property="MinWidth" Value="1" />
+  <Style x:Key="{x:Static StatusBar.SeparatorStyleKey}"
+         TargetType="{x:Type Separator}"
+         BasedOn="{StaticResource MaterialDesignSeparator}">
+    <Setter Property="Height" Value="Auto" />
     <Setter Property="Margin" Value="0,4" />
-    <Setter Property="SnapsToDevicePixels" Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Separator}">
-          <Rectangle Width="1"
-                     HorizontalAlignment="Center"
-                     VerticalAlignment="Stretch"
-                     Fill="{TemplateBinding Background}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="Width" Value="1" />
   </Style>
 
 </ResourceDictionary>
diff --git a/src/MaterialDesignToolkit.ResourceGeneration/ThemeColors.json b/src/MaterialDesignToolkit.ResourceGeneration/ThemeColors.json
@@ -547,15 +547,6 @@
         "alternateKeys": [],
         "obsoleteKeys": []
     },
-    {
-        "name": "MaterialDesign.Brush.StatusBar.Separator",
-        "themeValues": {
-            "light": "Black100",
-            "dark": "White100"
-        },
-        "alternateKeys": [],
-        "obsoleteKeys": []
-    },
     {
         "name": "MaterialDesign.Brush.TabControl.Divider",
         "themeValues": {
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Theme/ThemeTests.g.cs b/tests/MaterialDesignThemes.UITests/WPF/Theme/ThemeTests.g.cs
@@ -97,7 +97,6 @@ private partial string GetXamlWrapPanel()
           <TextBlock Text="Separator.Background" Background="{StaticResource MaterialDesign.Brush.Separator.Background}" />
           <TextBlock Text="StatusBar.Background" Background="{StaticResource MaterialDesign.Brush.StatusBar.Background}" />
           <TextBlock Text="StatusBar.Foreground" Background="{StaticResource MaterialDesign.Brush.StatusBar.Foreground}" />
-          <TextBlock Text="StatusBar.Separator" Background="{StaticResource MaterialDesign.Brush.StatusBar.Separator}" />
           <TextBlock Text="TabControl.Divider" Background="{StaticResource MaterialDesign.Brush.TabControl.Divider}" />
           <TextBlock Text="ToolBar.Background" Background="{StaticResource MaterialDesign.Brush.ToolBar.Background}" />
           <TextBlock Text="ToolBar.Separator" Background="{StaticResource MaterialDesign.Brush.ToolBar.Separator}" />
@@ -566,11 +565,6 @@ private partial async Task AssertAllThemeBrushesSet(IVisualElement<WrapPanel> pa
             Color? textBlockBackground = await textBlock.GetBackgroundColor();
             await Assert.That(textBlockBackground).IsEqualTo(await GetResourceColor("MaterialDesign.Brush.StatusBar.Foreground"));
         }
-        {
-            IVisualElement<TextBlock> textBlock = await panel.GetElement<TextBlock>("[Text=\"StatusBar.Separator\"]");
-            Color? textBlockBackground = await textBlock.GetBackgroundColor();
-            await Assert.That(textBlockBackground).IsEqualTo(await GetResourceColor("MaterialDesign.Brush.StatusBar.Separator"));
-        }
         {
             IVisualElement<TextBlock> textBlock = await panel.GetElement<TextBlock>("[Text=\"TabControl.Divider\"]");
             Color? textBlockBackground = await textBlock.GetBackgroundColor();
@@ -1005,7 +999,6 @@ private static IEnumerable<string> GetBrushResourceNames()
         yield return "MaterialDesign.Brush.Separator.Background";
         yield return "MaterialDesign.Brush.StatusBar.Background";
         yield return "MaterialDesign.Brush.StatusBar.Foreground";
-        yield return "MaterialDesign.Brush.StatusBar.Separator";
         yield return "MaterialDesign.Brush.TabControl.Divider";
         yield return "MaterialDesign.Brush.ToolBar.Background";
         yield return "MaterialDesign.Brush.ToolBar.Separator";

Original file line number	Diff line number	Diff line change
`@@ -828,13 +828,6 @@ public ColorReference Foreground`
`828`	`828`	`set => _foreground = value;`
`829`	`829`	`}`
`830`	`830`
`831`		`- private ColorReference _separator;`
`832`		`- public ColorReference Separator`
`833`		`- {`
`834`		`- get => _theme.Resolve(_separator);`
`835`		`- set => _separator = value;`
`836`		`- }`
`837`		`-`
`838`	`831`	`}`
`839`	`832`
`840`	`833`	`public class TabControl`