control over expander content alignment. fixes #478

Author: ButchersBoy

MainDemo.Wpf/ProvingGround.xaml

@@ -6,20 +6,19 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
              xmlns:wpfExample="clr-namespace:MaterialDesignColors.WpfExample"
-             TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-             Background="{DynamicResource MaterialDesignPaper}"
-             FontFamily="{StaticResource MaterialDesignFont}"
              mc:Ignorable="d"              
 			 d:DesignWidth="477" d:DesignHeight="272"
              d:DataContext="{d:DesignInstance wpfExample:ProvingGroundViewModel, d:IsDesignTimeCreatable=False}">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <!--
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ProgressBar.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Slider.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
+                -->
             </ResourceDictionary.MergedDictionaries>
 
 
@@ -29,40 +28,10 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <StackPanel Margin="8">
-        <ListBox Style="{StaticResource MaterialDesignToolToggleListBox}">
-            <ListBoxItem>
-                <materialDesign:PackIcon Kind="FormatAlignLeft"/>
-            </ListBoxItem>
-            <ListBoxItem>
-                <materialDesign:PackIcon Kind="FormatAlignCenter"/>
-            </ListBoxItem>
-            <ListBoxItem>
-                <materialDesign:PackIcon Kind="FormatAlignRight"/>
-            </ListBoxItem>
-            <ListBoxItem>
-                <materialDesign:PackIcon Kind="FormatAlignJustify"/>
-            </ListBoxItem>
-        </ListBox>
-
-        <ListBox Style="{StaticResource MaterialDesignToolToggleListBox}" 
-                 SelectionMode="Extended"
-                 Margin="0 8 0 0">
-            <ListBoxItem>
-                <materialDesign:PackIcon Kind="FormatBold"/>
-            </ListBoxItem>
-            <ListBoxItem>
-                <materialDesign:PackIcon Kind="FormatItalic"/>
-            </ListBoxItem>
-            <ListBoxItem x:Name="UnderlineCheckbox">
-                <materialDesign:PackIcon Kind="FormatUnderline"/>
-            </ListBoxItem>
-        </ListBox>
-
-        <CheckBox IsChecked="{Binding ElementName=UnderlineCheckbox, Path=IsSelected}">Underline?</CheckBox>
-        
-        <materialDesign:TimePicker Margin="0 16 0 0" SelectedTime="{Binding SelectedTime}" HorizontalAlignment="Left" />
-
-    </StackPanel>
+    <Grid>
+        <Expander Header="This is My Header" IsExpanded="True" HorizontalContentAlignment="Center">
+            <TextBlock>Hello World</TextBlock>
+        </Expander>
+    </Grid>
 
 </UserControl>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml

@@ -221,6 +221,8 @@
     <Style x:Key="MaterialDesignExpander" TargetType="{x:Type Expander}">
         <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Expander}">
@@ -291,9 +293,11 @@
                                           ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
                                           ContentStringFormat="{TemplateBinding HeaderStringFormat}"/>
                             <Border Name="ContentSite"
-                                    DockPanel.Dock="Bottom">
+                                    DockPanel.Dock="Bottom"                                    >
                                 <StackPanel Name="ContentPanel"
-                                            HorizontalAlignment="Left">
+                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                            Margin="{TemplateBinding Padding}"
+                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                                     <StackPanel.Tag>
                                         <system:Double>0.0</system:Double>
                                     </StackPanel.Tag>