remove divider between header and content of Expansion Panel

Author: spiegelp

MainDemo.Wpf/Expander.xaml

@@ -26,6 +26,7 @@
                                TextWrapping="Wrap"/>
                 </StackPanel>
             </Expander>
+            <Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
             <Expander HorizontalAlignment="Stretch"
                       Header="Expander Example 1b">
                 <StackPanel Orientation="Vertical"
@@ -36,6 +37,7 @@
                                TextWrapping="Wrap"/>
                 </StackPanel>
             </Expander>
+            <Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
             <Expander HorizontalAlignment="Stretch"
                       Header="Expander Example 1c">
                 <StackPanel Orientation="Vertical"
@@ -60,6 +62,7 @@
                                TextWrapping="Wrap"/>
                     </StackPanel>
                 </Expander>
+                <Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
                 <Expander HorizontalAlignment="Stretch"
                       Header="Expander Example 2b">
                     <StackPanel Orientation="Vertical"
@@ -70,6 +73,7 @@
                                TextWrapping="Wrap"/>
                     </StackPanel>
                 </Expander>
+                <Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
                 <Expander HorizontalAlignment="Stretch"
                       Header="Expander Example 2c">
                     <StackPanel Orientation="Vertical"
@@ -101,6 +105,7 @@
                                TextWrapping="Wrap"/>
                 </StackPanel>
             </Expander>
+            <Border Background="{DynamicResource MaterialDesignDivider}" Width="1" VerticalAlignment="Stretch" SnapsToDevicePixels="True" />
             <Expander ExpandDirection="Right">
                 <Expander.Header>
                     <TextBlock Text="Expander Example 3b" RenderTransformOrigin=".5,.5">
@@ -118,6 +123,7 @@
                                TextWrapping="Wrap"/>
                 </StackPanel>
             </Expander>
+            <Border Background="{DynamicResource MaterialDesignDivider}" Width="1" VerticalAlignment="Stretch" SnapsToDevicePixels="True" />
             <Expander ExpandDirection="Right">
                 <Expander.Header>
                     <TextBlock Text="Expander Example 3c" RenderTransformOrigin=".5,.5">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml

@@ -113,7 +113,6 @@
                                           HorizontalAlignment="Center"
                                           Margin="16 16 16 0"
                                           Content="{TemplateBinding Content}" VerticalAlignment="Top" />
-                        <Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 1 0" Grid.RowSpan="2" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -147,7 +146,6 @@
                                           HorizontalAlignment="Center"
                                           Margin="16 16 16 0"
                                           Content="{TemplateBinding Content}" VerticalAlignment="Top" />
-                        <Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="1 0 0 0" Grid.RowSpan="2" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -171,14 +169,13 @@
                                           ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                           ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
                                           VerticalAlignment="Center"
-                                          Margin="16 16 0 16" />                        
+                                          Margin="16 16 0 16" />
                         <ToggleButton Grid.Column="1"
                                       Margin="16 0 16 0"
                                       VerticalAlignment="Center"
                                       Foreground="{TemplateBinding Foreground}"
                                       IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                       Style="{StaticResource MaterialDesignExpanderToggleButton}"/>
-                        <Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1" Grid.ColumnSpan="2" SnapsToDevicePixels="True" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -211,7 +208,6 @@
                                 <RotateTransform Angle="-180"/>
                             </ToggleButton.RenderTransform>
                         </ToggleButton>
-                        <Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1" Grid.ColumnSpan="2" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>