From e975a9d36f5e7294a2c7051bbeebe15c3be5a906 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Sun, 15 Jun 2014 14:39:04 +0200
Subject: [PATCH] better coloring for blackout days

---
 MahApps.Metro/Styles/Controls.Calendar.xaml | 28 +++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/MahApps.Metro/Styles/Controls.Calendar.xaml b/MahApps.Metro/Styles/Controls.Calendar.xaml
index 7ecacfa93b..4123393c18 100644
--- a/MahApps.Metro/Styles/Controls.Calendar.xaml
+++ b/MahApps.Metro/Styles/Controls.Calendar.xaml
@@ -77,7 +77,7 @@
                                 <VisualState x:Name="BlackoutDay">
                                     <Storyboard>
                                         <DoubleAnimation Duration="0"
-                                                         To=".2"
+                                                         To="1"
                                                          Storyboard.TargetProperty="Opacity"
                                                          Storyboard.TargetName="Blackout" />
                                     </Storyboard>
@@ -96,11 +96,6 @@
                         <Rectangle x:Name="HighlightBackground"
                                    Opacity="0"
                                    Fill="{DynamicResource AccentColorBrush4}" />
-                        <ContentPresenter x:Name="NormalText"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          Margin="5,1,5,1"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          TextElement.Foreground="{DynamicResource GrayBrush1}" />
                         <Path x:Name="Blackout"
                               Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z"
                               HorizontalAlignment="Stretch"
@@ -109,7 +104,12 @@
                               RenderTransformOrigin="0.5,0.5"
                               Stretch="Fill"
                               VerticalAlignment="Stretch"
-                              Fill="{DynamicResource WhiteBrush}" />
+                              Fill="{DynamicResource AccentColorBrush3}" />
+                        <ContentPresenter x:Name="NormalText"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          Margin="5,1,5,1"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          TextElement.Foreground="{DynamicResource GrayBrush1}" />
                         <Rectangle x:Name="DayButtonFocusVisual"
                                    IsHitTestVisible="false"
                                    Visibility="Collapsed"
@@ -139,6 +139,20 @@
                                     Property="TextElement.Foreground"
                                     Value="{DynamicResource AccentSelectedColorBrush}" />
                         </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsToday"
+                                           Value="True" />
+                                <Condition Property="IsBlackedOut"
+                                           Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="TodayBackground"
+                                    Property="Opacity"
+                                    Value="0.5" />
+                            <Setter TargetName="Blackout"
+                                    Property="Fill"
+                                    Value="{DynamicResource AccentColorBrush}" />
+                        </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>