Fix DatePicker Calendar (#2412)

Author: StefanoRivolta-Previero

MainDemo.Wpf/Pickers.xaml

@@ -53,6 +53,37 @@
                             Style="{StaticResource MaterialDesignFloatingHintDatePicker}"/>
                     </smtx:XamlDisplay>
 
+                    <smtx:XamlDisplay
+                        UniqueKey="pickers_custom"
+                        HorizontalAlignment="Left"
+                        Margin="0 16 0 0">
+                        <DatePicker
+                            Width="100"
+                            materialDesign:HintAssist.Hint="Custom">
+                            <DatePicker.Resources>
+                                <Style x:Key="CustomCalendarDayButton" TargetType="CalendarDayButton" BasedOn="{StaticResource MaterialDesignCalendarDayButton}">
+                                    <Setter Property="materialDesign:CalendarAssist.SelectionColor" Value="#B2F39B"/>
+                                    <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor" Value="Black"/>
+                                </Style>
+                                <Style x:Key="CustomCalendarButton" TargetType="CalendarButton" BasedOn="{StaticResource MaterialDesignCalendarButton}">
+                                    <Setter Property="materialDesign:CalendarAssist.SelectionColor" Value="#B2F39B"/>
+                                    <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor" Value="Black"/>
+                                </Style>
+                                <Style x:Key="CustomCalendar" TargetType="{x:Type Calendar}" BasedOn="{StaticResource MaterialDesignDatePickerCalendarPortrait}">
+                                    <Setter Property="Background" Value="#343C3F"/>
+                                    <Setter Property="Foreground" Value="White"/>
+                                    <Setter Property="materialDesign:CalendarAssist.HeaderBackground" Value="#A2E9FF"/>
+                                    <Setter Property="materialDesign:CalendarAssist.HeaderForeground" Value="Black"/>
+                                    <Setter Property="CalendarDayButtonStyle" Value="{StaticResource CustomCalendarDayButton}"/>
+                                    <Setter Property="CalendarButtonStyle" Value="{StaticResource CustomCalendarButton}"/>
+                                </Style>
+                                <Style TargetType="DatePicker" BasedOn="{StaticResource MaterialDesignFloatingHintDatePicker}">
+                                    <Setter Property="CalendarStyle" Value="{StaticResource CustomCalendar}"/>
+                                </Style>
+                            </DatePicker.Resources>
+                        </DatePicker>
+                    </smtx:XamlDisplay>
+
                     <smtx:XamlDisplay
                         UniqueKey="pickers_2"
                         HorizontalAlignment="Left"

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml

@@ -420,29 +420,11 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MaterialDesignDatePickerCalendarPortrait" TargetType="{x:Type Calendar}">
-        <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
-        <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
-        <Setter Property="CalendarDayButtonStyle" Value="{StaticResource MaterialDesignCalendarDayButton}" />
-        <Setter Property="CalendarButtonStyle" Value="{StaticResource MaterialDesignCalendarButton}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Calendar}">
-                    <AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
-                        <Border Effect="{DynamicResource MaterialDesignShadowDepth4}" Padding="16 8 16 24">
-                            <CalendarItem
-                                x:Name="PART_CalendarItem"
-                                Style="{DynamicResource MaterialDesignCalendarItemPortrait}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                Background="{TemplateBinding Background}"
-                                wpf:CalendarAssist.IsHeaderVisible="{TemplateBinding wpf:CalendarAssist.IsHeaderVisible}" />
-                        </Border>
-                    </AdornerDecorator>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+    <Style x:Key="MaterialDesignDatePickerCalendarPortrait" TargetType="{x:Type Calendar}" BasedOn="{StaticResource MaterialDesignCalendarPortrait}">
+        <Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth4"/>
+        <Setter Property="Margin" Value="16 8 16 24"/>
     </Style>
-
+    
     <Style x:Key="MaterialDesignDatePicker" TargetType="{x:Type DatePicker}">
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />